From 7a79eaa785da277289ccdce588206a349e5fac6e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 14 一月 2026 10:26:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/MesToCombParam.java | 32 ++
src/main/java/com/zy/asrs/controller/OpenController.java | 108 ++++----
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 2
src/main/java/com/zy/asrs/entity/WrkMast.java | 15
src/main/java/com/zy/asrs/entity/param/OutTaskParam.java | 21 +
src/main/java/com/zy/asrs/service/OpenService.java | 16 +
/dev/null | 52 ----
src/main/java/com/zy/asrs/entity/WaitPakin.java | 12
src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java | 20 +
src/main/java/com/zy/asrs/entity/param/StationParam.java | 15 +
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 8
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 380 +++++++++++++++++++++-------
src/main/resources/application.yml | 18 -
src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java | 42 +++
14 files changed, 500 insertions(+), 241 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a3fb412..42ea5ea 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -3,12 +3,19 @@
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.service.WrkDetlService;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocDetlDto;
+import com.zy.common.model.enums.WorkNoType;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +42,12 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
// @PostMapping("/order/matSync/default/v1")
//// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -398,14 +411,17 @@
public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param){
System.out.println(param);
-// if (Cools.isEmpty(param)) {
-// return R.parse(BaseRes.PARAM);
-// }
-// MatSyncParam matSyncParam = new MatSyncParam();
-// List<MatSyncParam.MatParam> objects = new ArrayList<>();
-// objects.add(param);
-// matSyncParam.matDetails = objects;
-// openService.syncMat(matSyncParam);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ MatSyncParam matSyncParam = new MatSyncParam();
+ List<MatSyncParam.MatParam> objects = new ArrayList<>();
+ for (MatSyncParam.MatParam matParam : param) {
+ objects.add(matParam);
+ }
+
+ matSyncParam.matDetails = objects;
+ openService.syncMat(matSyncParam);
return R.ok();
}
@@ -419,41 +435,7 @@
*/
@PostMapping("/station/all")
public synchronized R stationAll(){
- List<LinkedHashMap<String,Object>> list =new ArrayList<>();
- LinkedHashMap<String,Object> map = new LinkedHashMap<>();
- map.put("stationId","101");
- map.put("stationType","3");
- map.put("stationName","101");
- list.add(map);
- System.out.println();
-// try {
-// //鑾峰彇Cookie鍊�
-// HashMap<String, Object> headers = new HashMap<>();
-// headers.put("accesstoken", erpSecret.getAccessToken());
-// headers.put("x-acgw-identity", xAcfwIdentity); // 鑷畾涔夎姹傚ご
-// response = new HttpHandler.Builder()
-// .setHeaders(headers)
-// .setUri(URL)
-// .setPath(path)
-// .setJson(add)
-// .build()
-// .doPost();
-// JSONObject jsonResponse = JSON.parseObject(response);
-// if (jsonResponse.getString("errorCode").equals("401")) {
-//
-// }
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// if (Cools.isEmpty(param)) {
-// return R.parse(BaseRes.PARAM);
-// }
-// MatSyncParam matSyncParam = new MatSyncParam();
-// List<MatSyncParam.MatParam> objects = new ArrayList<>();
-// objects.add(param);
-// matSyncParam.matDetails = objects;
-// openService.syncMat(matSyncParam);
- return R.ok().add(list);
+ return openService.stationAll();
}
/**
@@ -461,16 +443,32 @@
* return
*/
@PostMapping("/comb/auth")
- public synchronized R comb(@RequestBody ArrayList<HashMap<String,Object>> param){
- System.out.println(param);
-// if (Cools.isEmpty(param)) {
-// return R.parse(BaseRes.PARAM);
+ public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
+ for (MesToCombParam mesToCombParam : param) {
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
+ return R.error(mesToCombParam.getPalletId()+"-璇ユ墭鐩樼爜宸茬粡瀛樺湪缁勬墭妗ｄ腑");
+ }
+
+ if (mesToCombParam.getPalletId().length() != 8) {
+ return R.error(mesToCombParam.getPalletId()+"-璇ユ墭鐩樼爜涓嶄负8浣�");
+ }
+// if (param.getCombMats().size()>1){
+// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
// }
-// MatSyncParam matSyncParam = new MatSyncParam();
-// List<MatSyncParam.MatParam> objects = new ArrayList<>();
-// objects.add(param);
-// matSyncParam.matDetails = objects;
-// openService.syncMat(matSyncParam);
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", mesToCombParam.getPalletId()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", mesToCombParam.getPalletId()));
+// int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPalletId()));
+ if (countLoc > 0 || countWrk > 0) {
+ return R.error(mesToCombParam.getPalletId()+"-宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ }
+ }
+ for (MesToCombParam mesToCombParam : param) {
+ openService.mesToComb(mesToCombParam);
+ }
+
return R.ok();
}
@@ -479,8 +477,10 @@
*/
@PostMapping("/outOrder")
- public synchronized R outOrder (@RequestBody ArrayList<HashMap<String,Object>> param){
- System.out.println(param);
+ public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
+ for (OutTaskParam outTaskParam : params) {
+ openService.outOrder(outTaskParam);
+ }
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 3a7b1c3..285f1d1 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -44,6 +44,12 @@
@TableField("order_no")
private String orderNo;
+ @ApiModelProperty(value= "寤鸿鍏ュ簱鍖哄煙锛氬爢鍨涙満鍙�")
+ private String origin;
+
+ @ApiModelProperty(value= "搴撲綅缂栫爜锛岃嫢鏈夛紝鍒欏瓨鍌ㄥ埌鎸囧畾搴撲綅銆備负鍚庣画鍒嗗尯棰勭暀")
+ private String manu;
+
@ApiModelProperty(value= "瑙勬牸")
private String specs;
@@ -70,12 +76,6 @@
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
-
- @ApiModelProperty(value= "浜у湴")
- private String origin;
-
- @ApiModelProperty(value= "鍘傚")
- private String manu;
@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
@TableField("manu_date")
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 0d62697..15b6892 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -112,6 +112,14 @@
@TableField("loc_sts")
private String locSts;
+ @ApiModelProperty(value= "璁㈠崟鍙�")
+ @TableField("user_no")
+ private String userNo;
+
+ @ApiModelProperty(value= "鍑哄簱椤哄簭")
+ @TableField("plt_type")
+ private Integer pltType;
+
/**
* 鎷ｆ枡
*/
@@ -137,9 +145,6 @@
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
- @TableField("plt_type")
- private Integer pltType;
/**
* 绌烘澘
@@ -169,10 +174,6 @@
@ApiModelProperty(value= "")
@TableField("mtn_type")
private Double mtnType;
-
- @ApiModelProperty(value= "")
- @TableField("user_no")
- private String userNo;
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
diff --git a/src/main/java/com/zy/asrs/entity/param/MesToCombParam.java b/src/main/java/com/zy/asrs/entity/param/MesToCombParam.java
new file mode 100644
index 0000000..e6a2346
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/MesToCombParam.java
@@ -0,0 +1,32 @@
+package com.zy.asrs.entity.param;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+@Data
+public class MesToCombParam {
+ //鎵樼洏缂栫爜
+ private String palletId;
+ //鐗╂枡缂栧彿
+ private String matnr;
+ //鍏ュ簱鏁伴噺
+ private Double anfme;
+ //杩涗粨缂栧彿
+ private String entryWmsCode;
+ //po鍗曞彿
+ private String orderId;
+ //鎵瑰彿
+ private String batchId;
+ //璐х墿鐘舵�侊紝鏋氫妇锛�0 姝ｅ父锛�1 寮傚父锛�
+ private Integer status;
+ //鏄惁婊℃澘锛�0 绌烘澘锛�1 婊℃澘锛�2 鍗婃澘锛�
+ private Integer full;
+ //寤鸿鍏ュ簱鍖哄煙锛屾灇涓撅紝1 A搴擄紱2 B搴擄紱3 C搴擄紱鎴栨煇涓贩閬擄紱
+ private String storageArea;
+ //搴撲綅缂栫爜锛岃嫢鏈夛紝鍒欏瓨鍌ㄥ埌鎸囧畾搴撲綅銆備负鍚庣画鍒嗗尯棰勭暀
+ private String locId;
+ //鎿嶄綔绫诲瀷锛�1 缁勬墭锛�2 缁勬墭瑙ｇ粦锛�
+ private Integer operateType;
+ //鍞竴鐮�
+ private String BizNo;
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/OutTaskParam.java b/src/main/java/com/zy/asrs/entity/param/OutTaskParam.java
new file mode 100644
index 0000000..16c9a6a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/OutTaskParam.java
@@ -0,0 +1,21 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class OutTaskParam {
+ //鍑哄簱椤哄簭锛屼粠1寮�濮�
+ private Integer seq;
+ //鎵樼洏缂栫爜
+ private String palletId;
+ //鍑哄簱鍙ｇ紪鐮�
+ private String stationId;
+ //鐗╂枡缂栫爜
+ private String matnr;
+ //鍏ュ簱鏁伴噺
+ private double anfme;
+ //杩涗粨缂栧彿
+ private String entryWmsCode;
+ //鍑哄簱鍗曞彿
+ private String orderId;
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/StationParam.java b/src/main/java/com/zy/asrs/entity/param/StationParam.java
new file mode 100644
index 0000000..b3172a9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/StationParam.java
@@ -0,0 +1,15 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class StationParam {
+ //绔欑偣缂栧彿
+ private String stationId;
+ //绔欑偣杩涘嚭绫诲瀷
+ private String stationType;
+ //绔欑偣鍚嶇О
+ private String stationName;
+ //鎿嶄綔绫诲瀷锛�1 鏂板锛�2 淇敼锛�3 绂佺敤锛�4 鍙嶇鐢紱
+ private Integer operateType;
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 45df305..65ac122 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service;
+import com.core.common.R;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
@@ -60,4 +61,19 @@
boolean agvBindAndBin(String taskNo);
boolean taskArmOrderResult(OrderArmEndParam param);
List<PickWrkDetlListParam> getPickList(PdaPickListParam param);
+
+ /**
+ * 杈撳嚭鎵�鏈夊叆搴撶珯鍜屽嚭搴撶珯绔欑偣
+ * @return
+ */
+ R stationAll ();
+
+ /**
+ * mes鍙戠粍鎵樻。缁欏埌wms
+ */
+ R mesToComb(MesToCombParam param);
+ /**
+ *
+ */
+ R outOrder(OutTaskParam param);
}
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 e97f2f5..b3f4727 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,10 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SnowflakeIdWorker;
-import com.core.common.SpringUtils;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
@@ -21,20 +18,20 @@
import com.zy.common.constant.AgvConstant;
import com.zy.common.constant.ArmConstant;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocDetlDto;
+import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
import com.zy.erp.kingdee.utils.PostMesDataUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.rmi.CORBA.Util;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* Created by vincent on 2022/4/9
@@ -79,6 +76,19 @@
private LocMastServiceImpl locMastService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private BasDevpServiceImpl basDevpService;
+ @Autowired
+ private StaDescServiceImpl staDescService;
+ @Value("${mes.url}")
+ private String mesUrl;
+ @Value("${mes.stationaddress}")
+ private String stationAddress;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkMastService wrkMastService;
+
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
@@ -139,9 +149,9 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -199,23 +209,23 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 6L, null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
} else {
// 鎵�鏈夎鍗�
// List<Order> orders = orderService.selectBySettle(4L);
List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
- if (orders.isEmpty()){
+ if (orders.isEmpty()) {
orders = new ArrayList<>();
}
for (Order order : orders) {
@@ -228,16 +238,16 @@
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(),
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(),
orderDetl.getQty()));
}
// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
@@ -308,11 +318,11 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(),
+ detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
- dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(),
+ dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -368,15 +378,15 @@
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(),order.getId());
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
} else {
@@ -392,15 +402,15 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
}
}
return results;
@@ -530,19 +540,19 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
- if(param.getMatDetails().get(0).getOperateType()==3){
+ if (param.getMatDetails().get(0).getOperateType() == 3) {
Mat mat1 = matService.selectByMatnr(param.getMatDetails().get(0).getMatnr());
- if(Cools.isEmpty(mat1)){
+ if (Cools.isEmpty(mat1)) {
throw new CoolException("鍟嗗搧涓嶅瓨鍦ㄦ棤娉曠鐢�");
}
}
- if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
- for(MatSyncParam.MatParam matParam : param.getMatDetails()){
- if(Cools.isEmpty(matParam.getMatnr())){
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ if (Cools.isEmpty(matParam.getMatnr())) {
throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
}
@@ -635,7 +645,7 @@
}
} else {
mat.sync(matParam);
- if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
}
@@ -649,7 +659,7 @@
BasArmMast basArmMast = new BasArmMast(param);
List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("sorting_line_sou", basArmMast.getSortingLine()));
for (BasArm basArm : basArmList) {
- if (basArm.getStatus()!=1){
+ if (basArm.getStatus() != 1) {
continue;
}
basArmMast.setArmNo(basArm.getArmNo());
@@ -662,10 +672,10 @@
.eq("arm_no", basArmMast.getArmNo())
.eq("status", 0)
);
- if (Cools.isEmpty(basArmMastOld)){
+ if (Cools.isEmpty(basArmMastOld)) {
basArmMastService.insert(basArmMast);
} else {
- throw new CoolException("绛夊緟鍓嶈竟璐х墿鎶撳彇锛侊紒锛�"+ JSON.toJSONString(param));
+ throw new CoolException("绛夊緟鍓嶈竟璐х墿鎶撳彇锛侊紒锛�" + JSON.toJSONString(param));
}
}
@@ -677,23 +687,23 @@
.eq("sorting_line", Integer.parseInt(param.getStaNo()))
.eq("status", 1)
);
- if (Cools.isEmpty(basArm)){
+ if (Cools.isEmpty(basArm)) {
return;
// throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
}
- try{
+ try {
BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
new EntityWrapper<BasArmMastSign>()
.eq("matnr", param.getMatnr())
.eq("order_no", param.getOrderNo())
.eq("create_time", param.getBindingTags())
);
- if (!Cools.isEmpty(basArmMastSign)){
+ if (!Cools.isEmpty(basArmMastSign)) {
basArmMastSign.setStatus(1);
basArmMastSignService.updateById(basArmMastSign);
}
- } catch (Exception e){
+ } catch (Exception e) {
}
BasArmMast basArmMastListError = basArmMastService.selectOne(
@@ -702,8 +712,8 @@
.eq("arm_no", param.getArm_no())
.eq("status", 9)
);
- if (!Cools.isEmpty(basArmMastListError)){
- if (Integer.parseInt(param.getPick_num()) ==1){
+ if (!Cools.isEmpty(basArmMastListError)) {
+ if (Integer.parseInt(param.getPick_num()) == 1) {
basArmMastListError.setStatus(2);
basArmMastService.updateById(basArmMastListError);
}
@@ -717,11 +727,11 @@
.eq("arm_no", param.getArm_no())
.eq("status", 1)
);
- if (Cools.isEmpty(basArmMast)){
+ if (Cools.isEmpty(basArmMast)) {
return;
// throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
- if (Integer.parseInt(param.getPick_num()) !=1){
+ if (Integer.parseInt(param.getPick_num()) != 1) {
basArmMast.setStatus(9);
basArmMastService.updateById(basArmMast);
} else {
@@ -738,28 +748,28 @@
.eq("sta_no", param.getStaNo())
.eq("status", 1)
);
- if (Cools.isEmpty(basArm)){
- log.error("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ if (Cools.isEmpty(basArm)) {
+ log.error("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒" + JSON.toJSONString(param));
return false;
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", basArm.getStaNoSou()));
- if (Cools.isEmpty(locMast)){
- log.error("鏌ヨ涓嶅埌locMast鏁版嵁锛侊紒锛�"+ JSON.toJSONString(param));
+ if (Cools.isEmpty(locMast)) {
+ log.error("鏌ヨ涓嶅埌locMast鏁版嵁锛侊紒锛�" + JSON.toJSONString(param));
return false;
}
- if (locMast.getLocSts().equals("D")){
+ if (locMast.getLocSts().equals("D")) {
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
.eq("sta_no", basArm.getStaNoSou())
.eq("arm_no", param.getArmNo())
.eq("status", 3)
);
- if (Cools.isEmpty(basArmMast)){
+ if (Cools.isEmpty(basArmMast)) {
return true;
}
- log.error("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ log.error("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�" + JSON.toJSONString(param));
} else {
- log.error("locMast鐘舵�佷笉涓篋锛侊紒锛�"+ JSON.toJSONString(param));
+ log.error("locMast鐘舵�佷笉涓篋锛侊紒锛�" + JSON.toJSONString(param));
}
return false;
}
@@ -772,8 +782,8 @@
.eq("sta_no", Integer.parseInt(param.getId()))
.eq("status", 1)
);
- if (Cools.isEmpty(basArm)){
- throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ if (Cools.isEmpty(basArm)) {
+ throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒" + JSON.toJSONString(param));
}
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
@@ -781,11 +791,11 @@
.eq("arm_no", param.getArm_no())
.eq("status", 2)
);
- if (Cools.isEmpty(basArmMast)){
- throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ if (Cools.isEmpty(basArmMast)) {
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�" + JSON.toJSONString(param));
}
// basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
- basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
+ basArmMastService.updateArmMastStatus(param.getArm_no(), basArmMast.getSortingLine(), basArmMast.getStaNo(), 2, 3);
}
@Override
@@ -796,33 +806,33 @@
.eq("sorting_line", Integer.parseInt(param.getStaNo()))
.eq("status", 1)
);
- if (Cools.isEmpty(basArm)){
- throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ if (Cools.isEmpty(basArm)) {
+ throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒" + JSON.toJSONString(param));
}
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
- .eq("sorting_line",basArm.getSortingLineSou())
+ .eq("sorting_line", basArm.getSortingLineSou())
.eq("arm_no", param.getArm_no())
.eq("status", 5)
);
- if (!Cools.isEmpty(basArmMast)){
- basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(), 5,6);
+ if (!Cools.isEmpty(basArmMast)) {
+ basArmMastService.updateArmMastStatus(param.getArm_no(), basArmMast.getSortingLine(), basArmMast.getStaNo(), 5, 6);
}
}
@Override
@Transactional
- public boolean taskArmOrderResult(OrderArmEndParam param){
- if(param.getDone_num() == 0){
- if(basArmMastService.delete(new EntityWrapper<BasArmMast>().eq("arm_no",param.getArm_no())
- .eq("status",1))){
+ public boolean taskArmOrderResult(OrderArmEndParam param) {
+ if (param.getDone_num() == 0) {
+ if (basArmMastService.delete(new EntityWrapper<BasArmMast>().eq("arm_no", param.getArm_no())
+ .eq("status", 1))) {
return true;
}
}
- if(param.getDone_num() == 1){
+ if (param.getDone_num() == 1) {
return true;
}
- log.error("鏈壘鍒板搴斾换鍔�"+ param);
+ log.error("鏈壘鍒板搴斾换鍔�" + param);
return false;
}
@@ -835,7 +845,7 @@
.eq("create_time", param.getBindingTags())
.eq("status", 0)
);
- if (Cools.isEmpty(basArmMastSignNew)){
+ if (Cools.isEmpty(basArmMastSignNew)) {
return false;
}
return true;
@@ -845,7 +855,7 @@
@Transactional
public boolean TaskAgvReport(TaskAgvReportParam param) {
BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no", param.getTaskNo()));
- if (Cools.isEmpty(basAgvMast)){
+ if (Cools.isEmpty(basAgvMast)) {
return false;
}
basAgvMast.setStatus(2);
@@ -886,7 +896,7 @@
basAgvMast.setModiTime(new Date());
basAgvMast.setIoType(param.getIoType());
basAgvMast.setFloorNo(param.getFloorNo());
- switch (basAgvMast.getIoType()){
+ switch (basAgvMast.getIoType()) {
// AGV搴撲綅==銆嬭緭閫佺嚎绔欑偣 0
// AGV搴撲綅==銆婣GV搴撲綅 1
// 杈撻�佺嚎绔欑偣==銆婣GV搴撲綅 2
@@ -908,12 +918,13 @@
bindParam.setFloorNo(basAgvMast.getFloorNo());
bindParam.setLocNo(locNo);
bindParam.setStaNo(staNo);
- if(bindCtnrAndBin(bindParam)){
+ if (bindCtnrAndBin(bindParam)) {
return true;
- }else{
+ } else {
throw new CoolException("鏈兘缁戝畾");
}
}
+
@Override
@Transactional
public List<PickWrkDetlListParam> getPickList(PdaPickListParam param) {
@@ -953,6 +964,7 @@
return result;
}
+
@Override
@Transactional
public List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param) {
@@ -973,7 +985,7 @@
);
result.add(buildAgvLocListDetlParam(param.getLocNo(), locMast.getLocSts$()));
}
-
+
return result;
}
@@ -981,7 +993,7 @@
List<BasAgvLocDetl> detlList = basAgvLocDetlService.selectList(
new EntityWrapper<BasAgvLocDetl>().eq("loc_no", locNo)
);
-
+
AgvLocListDetlParam dto = new AgvLocListDetlParam();
dto.setLocNo(locNo);
dto.setLocSys(locSts);
@@ -997,7 +1009,7 @@
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
}
- if (param.getFloorNo()==1){
+ if (param.getFloorNo() == 1) {
AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
@@ -1005,15 +1017,15 @@
agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
agvBindCtnrAndBinParam.setCtnrTyp("1");
- if(basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null){
+ if (basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null) {
agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
}
- if(basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null){
+ if (basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null) {
agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoSou.getAgvLocNo());
}
agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
try {
- String URL = AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService; // AGV鎺ュ彛鍦板潃
+ String URL = AgvConstant.AGV_URL + "/" + AgvConstant.AGV_hikRpcService; // AGV鎺ュ彛鍦板潃
String mesPath = AgvConstant.getAGVADAPTOR(param.getFloorNo()); // 鎺ュ彛璺緞
String response = "";
boolean success = false;
@@ -1043,18 +1055,17 @@
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
- } else {}
+ } else {
+ }
return true;
}
-
-
@Override
@Transactional
public boolean agvApplicationPassedTheGrating(ArmAgvGratingParam arm) {
ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡璇锋眰涓嬪彂锛�", ArmConstant.getArmUrl(arm.getArmNo()), ArmConstant.ARM_ADAPTOR_GRATING_AGVENTER, arm);
- if (result.getCode()==200){
+ if (result.getCode() == 200) {
return true;
}
return false;
@@ -1071,7 +1082,7 @@
agvGoParam.setReqCode(param.getReqCode());
agvGoParam.setTaskCode(param.getTaskCode());
ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡涓嬪彂鍚庣户缁换鍔★細", URL, AGVPath, agvGoParam);
- if (result.getCode()==200){
+ if (result.getCode() == 200) {
return true;
}
return false;
@@ -1082,11 +1093,11 @@
public boolean agvBindAndBin(String taskNo) {
String URL = "http://10.10.10.200:8181"; // AGV鎺ュ彛鍦板潃
String AGVPath = "rcms/services/rest/hikRpcService/bindCtnrAndBin"; // 鎺ュ彛璺緞
- BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no",taskNo));
- if (Cools.isEmpty(basAgvMast)){
+ BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no", taskNo));
+ if (Cools.isEmpty(basAgvMast)) {
return false;
}
- if (basAgvMast.getFloorNo()==1){
+ if (basAgvMast.getFloorNo() == 1) {
BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo())
@@ -1097,37 +1108,38 @@
String binCode = basAgvLocNoEnd != null
? basAgvLocNoEnd.getAgvLocNo()
: (locNo != null ? locNo.getAgvLocNo() : null);
- if (Cools.isEmpty(basAgvMast)){
+ if (Cools.isEmpty(basAgvMast)) {
return false;
}
- String ctnrCode = basAgvMast.getBarcode().length() > 1?basAgvMast.getBarcode():basAgvMast.getTimestamp().toString();
+ String ctnrCode = basAgvMast.getBarcode().length() > 1 ? basAgvMast.getBarcode() : basAgvMast.getTimestamp().toString();
AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
agvBindCtnrAndBinParam.setReqCode(basAgvMast.getTaskNo() + "-" + System.currentTimeMillis());
agvBindCtnrAndBinParam.setCtnrCode(ctnrCode);
agvBindCtnrAndBinParam.setCtnrTyp("1");
agvBindCtnrAndBinParam.setStgBinCode(binCode);
agvBindCtnrAndBinParam.setIndBind("0");
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦", URL,AGVPath, agvBindCtnrAndBinParam);
- if (resultBind.getCode() ==200){
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦", URL, AGVPath, agvBindCtnrAndBinParam);
+ if (resultBind.getCode() == 200) {
basAgvMast.setStatus(4);
basAgvMastService.updateById(basAgvMast);
return true;
}
return false;
- }else {
+ } else {
if (basAgvMast != null
&& basAgvMast.getIoType() != null
&& (basAgvMast.getIoType() == 0)
&& (Objects.equals(basAgvMast.getSourceStaNo(), 2033) || Objects.equals(basAgvMast.getStaNo(), 2034)
- || Objects.equals(basAgvMast.getStaNo(), 4003)|| Objects.equals(basAgvMast.getSourceStaNo(), 4006))){
+ || Objects.equals(basAgvMast.getStaNo(), 4003) || Objects.equals(basAgvMast.getSourceStaNo(), 4006))) {
AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
agvBindCtnrAndBinTwoParam.setReqCode(String.valueOf(snowflakeIdWorker.nextId()));
agvBindCtnrAndBinTwoParam.setPodcode(basAgvMast.getBarcode());
agvBindCtnrAndBinTwoParam.setPositionCode(basAgvMast.getStaNo().toString());
- agvBindCtnrAndBinTwoParam.setIndBind("0");;
+ agvBindCtnrAndBinTwoParam.setIndBind("0");
+ ;
ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒瑙ｇ粦",
- AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService,AgvConstant.getAGVADAPTOR(2), agvBindCtnrAndBinTwoParam);
- if (resultBind.getCode()!=1){
+ AgvConstant.AGV_URL + "/" + AgvConstant.AGV_hikRpcService, AgvConstant.getAGVADAPTOR(2), agvBindCtnrAndBinTwoParam);
+ if (resultBind.getCode() != 1) {
basAgvMast.setStatus(4);
basAgvMastService.updateById(basAgvMast);
return true;
@@ -1138,6 +1150,176 @@
}
+ @Override
+ @Transactional
+ public R stationAll() {
+ List<StationParam> stationParams = new ArrayList<>();
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ for (BasDevp basDevp : basDevps) {
+ StationParam stationParam = new StationParam();
+ Boolean boo1 = false;
+ Boolean boo2 = false;
+ StaDesc staDescIn = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no", basDevp.getDevNo()).eq("type_no", 1));
+ if (!Cools.isEmpty(staDescIn)) {
+ stationParam.setStationId(basDevp.getDevNo() + "");
+ stationParam.setStationType("1");
+ stationParam.setStationName(basDevp.getDevNo() + "");
+ stationParam.setOperateType(1);
+ boo1 = true;
+ }
+ StaDesc staDescOut = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no", basDevp.getDevNo()).eq("type_no", 101));
+ if (!Cools.isEmpty(staDescOut)) {
+ stationParam.setStationId(basDevp.getDevNo() + "");
+ stationParam.setStationType("1");
+ stationParam.setStationName(basDevp.getDevNo() + "");
+ stationParam.setOperateType(2);
+ if (boo1) {
+ stationParam.setOperateType(3);
+ }
+ boo2 = true;
+ }
+ if (boo1 || boo2) {
+ stationParams.add(stationParam);
+ }
+ }
+ String response = "";
+ try {
+ //鑾峰彇Cookie鍊�
+ HashMap<String, Object> headers = new HashMap<>();
+// headers.put("accesstoken", erpSecret.getAccessToken());
+// headers.put("x-acgw-identity", xAcfwIdentity); // 鑷畾涔夎姹傚ご
+ response = new HttpHandler.Builder()
+ .setHeaders(headers)
+ .setUri(mesUrl)
+ .setPath(stationAddress)
+ .setJson(JSON.toJSONString(stationParams))
+ .build()
+ .doPost();
+ JSONObject jsonResponse = JSON.parseObject(response);
+ if (jsonResponse.getInteger("code") == 200) {
+ } else {
+ return R.error();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return R.ok();
+ }
+ @Override
+ public R mesToComb(MesToCombParam param) {
+ if (Cools.isEmpty(param.getPalletId())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ Date now = new Date();
+
+ Mat mat = matService.selectByMatnr(param.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ if (param.getFull()==1){
+ //婊℃墭鐩�
+ mat = matService.selectByMatnr("1");
+ }else if (param.getFull()==0){
+ //绌烘墭鐩�
+ mat = matService.selectByMatnr("0");
+ }
+
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setBatch(String.valueOf(param.getBatchId()));
+ waitPakin.setZpallet(param.getPalletId()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(param.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(9995L);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(9995L);
+ waitPakin.setModiTime(now);
+ waitPakin.setOrderNo(String.valueOf(param.getOrderId()));
+ waitPakin.setOrigin(String.valueOf(param.getStorageArea()));//寤鸿鍏ュ簱鍖哄煙
+ waitPakin.setManu(String.valueOf(param.getLocId()));//mes鍏蜂綋搴撲綅缂栧彿
+ waitPakin.setThreeCode(param.getBizNo());
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ return null;
+ }
+
+ @Override
+ public R outOrder(OutTaskParam param) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("barcode", param.getPalletId()));
+ if (locMast == null) {
+ return R.error("娌℃湁鎵惧埌鎵樼洏鐮�="+param.getPalletId()+"瀵瑰簲鐨勫簱浣�");
+ }
+ Integer ioType = 101;
+ // 鑾峰彇璺緞
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), Integer.valueOf(param.getStationId()));
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setUserNo(param.getOrderId());//璁㈠崟鍙�
+ wrkMast.setPltType(param.getSeq());//鍑哄簱椤哄簭锛屼粠1寮�濮�
+ wrkMast.setTakeNone("0"); //0闈炶嚜鍔�
+ wrkMast.setAppeUser(9995L); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(9995L);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locMast.getLocNo());
+ }
+ List<LocDetl> locNo = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+ if (locNo == null || locNo.size() == 0) {
+ throw new CoolException("鏌ヨ搴撳瓨鏄庣粏澶辫触锛屽嚭搴撳簱浣嶅彿锛�"+locMast.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (LocDetl locDetl : locNo) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(locDetl);
+ wrkDetl.setOrderNo(param.getOrderId()); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ Double anfme = locDetl.getAnfme();
+ wrkDetl.setAnfme(anfme); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(9995L);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(9995L);
+
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ }
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.selectById(locMast.getLocNo());
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts("R");
+ locMast.setModiUser(9995L);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
+ }
+ } else {
+ log.error(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ throw new CoolException(locMast.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ return R.ok();
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java b/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java
deleted file mode 100644
index 4ea6a9d..0000000
--- a/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.zy.asrs.task;
-
-import com.alibaba.fastjson.JSON;
-import com.zy.asrs.entity.BasArmRules;
-import com.zy.asrs.entity.param.ArmPrecomputeParam;
-import com.zy.asrs.service.BasArmRulesService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.ArmRulesHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Component
-public class ArmRulesScheduler {
-
- private static final Logger log = LoggerFactory.getLogger(ArmRulesScheduler.class);
-
- @Autowired
- private BasArmRulesService basArmRulesService;
- @Autowired
- private ArmRulesHandler armRulesHandler;
-
- @Scheduled(cron = "0/30 * * * * ? ")
- private void execute(){
- List<BasArmRules> basArmRules = basArmRulesService.AllStatusSatisfyBasArmRules(0);
- if (basArmRules.isEmpty()) {
- return;
- }
- for (BasArmRules basArmRule: basArmRules) {
- try{
- if (basArmRule.getMaterialHeight()>0 && basArmRule.getMaterialLength()>0 && basArmRule.getMaterialWeight()>0 && basArmRule.getMaterialWidth()>0){
- ArmPrecomputeParam armPrecomputeParam = new ArmPrecomputeParam(basArmRule);
- ReturnT<String> returnT = armRulesHandler.start(armPrecomputeParam);
- if (!returnT.isSuccess()) {
- basArmRule.setStatus(2);
- basArmRulesService.updateById(basArmRule);
- log.error("鑾峰彇鐮佸灈鏁伴噺澶辫触===>"+JSON.toJSON(basArmRule));
- }
- } else {
- basArmRule.setStatus(2);
- basArmRulesService.updateById(basArmRule);
- }
- } catch (Exception e){
- log.error("鑾峰彇鐮佸灈鏁伴噺寮傚父===>"+e.getMessage());
- }
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java b/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java
new file mode 100644
index 0000000..ae73b41
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/AutomaticallyIssueWCSTasksScheduler.java
@@ -0,0 +1,42 @@
+package com.zy.asrs.task;
+
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.WorkMastHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+@Component
+public class AutomaticallyIssueWCSTasksScheduler {
+ private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WorkMastHandler workMastHandler;
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute(){
+ List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+ for (WrkMast wrkMast : wrkMasts) {
+ ReturnT<String> returnT = workMastHandler.start(wrkMast);
+ if (!returnT.isSuccess()) {
+ wrkMast.setUpdMk("X");
+ wrkMast.setErrorMemo(returnT.getMsg());
+ wrkMast.setErrorTime(new Date());
+ if (!wrkMastService.updateById(wrkMast)) {
+ log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
+ }
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 6fa596c..1a18b10 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -1,13 +1,11 @@
package com.zy.asrs.task;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderToLine;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.OrderToLineHandler;
import com.zy.asrs.utils.ToSortLineUtils;
import com.zy.asrs.utils.param.ItemUtilParam;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 7cec24c..98d61d4 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -41,14 +41,6 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000 && wrkMast.getWrkNo() != 9997 && wrkMast.getWrkNo() != 9996){
- if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
- continue;
- }
- }
- if (!Cools.isEmpty(wrkMast.getTakeNone()) && wrkMast.getTakeNone().equals("1")){
- continue;
- }
ReturnT<String> result = workLogHandler.start(wrkMast);
if (!result.isSuccess()) {
log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
diff --git a/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java
deleted file mode 100644
index 0de8683..0000000
--- a/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.zy.asrs.task;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.BasAgvMast;
-import com.zy.asrs.service.BasAgvMastService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.WrkMastAgvHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Slf4j
-@Component
-public class WrkMastAgvScheduler {
-
- @Autowired
- private WrkMastAgvHandler wrkMastAgvHandler;
- @Autowired
- private BasAgvMastService basAgvMastService;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
- List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status",2));
- if (basAgvMastList.isEmpty()) {
- return;
- }
- for (BasAgvMast basAgvMast : basAgvMastList) {
- try{
- ReturnT<String> result = wrkMastAgvHandler.start(basAgvMast);
- if (!result.isSuccess()) {
- log.error("AGV宸ヤ綔妗ｅ伐浣滄。[TaskNo={}]瀹屾垚浠诲姟澶勭悊澶辫触:"+result.getMsg(), basAgvMast.getTaskNo());
- }
- } catch (Exception e) {
- log.error("AGV宸ヤ綔妗ｅ伐浣滄。[TaskNo={}]瀹屾垚浠诲姟澶勭悊澶辫触:"+e.getMessage(), basAgvMast.getTaskNo());
-
- }
- }
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
deleted file mode 100644
index 205d109..0000000
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ /dev/null
@@ -1,313 +0,0 @@
-package com.zy.asrs.task;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.service.*;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.WrkMastStaInItHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * Created by Monkey D. Luffy on 2023.07.25
- * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............灏忚溅鎵ц浣滀笟鐢熸垚
- */
-@Component
-public class WrkMastStaInItScheduler {
-
- private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
-
- @Autowired
- private WrkMastStaInItHandler wrkMastStaInItHandler;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private RgvOneSignService rgvOneSignService;
- @Autowired
- private WrkMastStaService wrkMastStaService;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private LocDetlService locDetlService;
-
- //鍏ュ簱鍙�
- public static final List<Integer> STA_WORK_IN = new ArrayList<Integer>() {{
- add(1042);add(1043);add(1044);add(1104);add(1105);add(1103);add(1038);add(1036);add(2037);
- }};
-
- //鍑哄簱鍙�
- public static final List<Integer> STA_WORK_OUT = new ArrayList<Integer>() {{
- add(1007);add(1005);add(1010);add(1008);add(1021);add(1019);
- add(1024);add(1022);add(1031);add(1029);add(2003);add(2001);
- add(2009);add(2007);add(2015);add(2013);add(2021);add(2019);
- add(2027);add(2025);
- }};
- public static final Map<Integer, Integer> siteOutMap = new HashMap<Integer, Integer>() {{
- put(1007, 1007);put(1010, 1010);put(1021, 1021);put(1024, 1024);put(1031, 1031);
- put(1005, 1007);put(1008, 1010);put(1019, 1021);put(1022, 1024);put(1029, 1031);
- put(2001, 2003);put(2007, 2009);put(2013, 2015);put(2019, 2021);put(2025, 2027);
- put(2003, 2003);put(2009, 2009);put(2015, 2015);put(2021, 2021);put(2027, 2027);
- put(1105,1105);put(1104,1105);put(1043,1042);put(1042,1042);put(1103,1105);put(1044,1042);
- }};
- public static final Map<Integer, Integer> siteInMap = new HashMap<Integer, Integer>() {{
- put(1043, 1042);put(1042, 1042);put(1044, 1042);put(1105, 1105);put(1104, 1105);
- put(1103, 1105);put(1036, 1036);put(1038, 1038);put(2037,2037);
- }};
-
- // 寮傚父鍑哄簱鍙�
- public static final List<Integer> STA_WORK_Exception = new ArrayList<Integer>() {{
- add(1042);add(1105);add(1104);add(1043);add(1044);add(1103);
- }};
-
-// public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
-// add(120);add(121);
-// }};
-// public static final List<Integer> STA_WORK_CU_CAR_THREE = new ArrayList<Integer>() {{
-// add(118);add(120);
-// }};
-// public static final List<Integer> STA_WORK_CU_CAR_FOUR = new ArrayList<Integer>() {{
-// add(119);add(121);
-// }};
-
-// public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
-// add(118);add(119);add(120);add(121);add(122);add(123);
-// }};
-
-
- @Scheduled(cron = "0/2 * * * * ? ")
- private void execute(){
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String currentTime = sdf.format(new Date());
- for(Integer staNo : STA_WORK_IN){
- BasDevp basDevp = basDevpService.selectById(staNo);
- basDevp.setDevNo(siteInMap.get(basDevp.getDevNo()));
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if(Cools.isEmpty(wrkMast)){
- continue;
- }
- if (!Cools.isEmpty(wrkMast)){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,21);//鍏ュ簱
- if (result.getCode()==200){
- continue;
- }else {
- System.out.println(staNo+"澶辫触1锛�");
- }
- }
- }
- }
-
- for(Integer staNo : STA_WORK_OUT){
- BasDevp basDevp = basDevpService.selectById(staNo);
- basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo()));
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if (Cools.isEmpty(wrkMast)){
- continue;
- }
- if (!Cools.isEmpty(wrkMast)){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,22);//鍑哄簱
- if (result.getCode()==200) {
- continue;
- } else {
- System.out.println(staNo+"澶辫触2锛�");
- }
- }
- }
- }
- for(Integer staNo: STA_WORK_Exception){
- BasDevp basDevp = basDevpService.selectById(staNo);
- basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo()));
- if (basDevp.getWrkNo() > 10000 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
- ReturnT<String> result = wrkMastStaInItHandler.start(null,basDevp,23);//寮傚父閫�鍑�
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
- if (Cools.isEmpty(wrkMast)){
- continue;
- }
- if (result.getCode() == 200) {
- System.out.println(staNo + "鏃堕棿锛�" + currentTime);
- continue;
- } else {
- System.out.println(staNo+"澶辫触3锛�");
- }
-
- }
- }
- }
-
-// @Scheduled(cron = "0/3 * * * * ? ")
-// private void execute2(){
-// try{
-// for(Integer staNo : STA_WORK_CU){
-// BasDevp basDevp = basDevpService.selectById(staNo);
-// if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
-// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
-// if(Cools.isEmpty(wrkMast)){
-// continue;
-// }
-// if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=104){
-// continue;
-// }
-// if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
-// continue;
-// }
-// if (wrkMast.getStaNo()<118 || wrkMast.getStaNo()>121){
-// continue;
-// }
-// int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMast.getStaNo()).or().eq("sta_end", wrkMast.getStaNo()));
-// if (count!=0){
-// continue;
-// }
-// int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo()));
-// if (countStart!=0){
-// continue;
-// }
-// BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNo());
-// if (!basDevpEnd.getLoading().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
-// continue;
-// }
-// if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
-// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
-// if (rgvOneSign.getRgvOneSign()==1){
-// continue;
-// }
-// }
-// if (wrkMast.getIoType()!=101){
-// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-// if (wrkDetls.size()!=0){
-// String origin = wrkDetls.get(0).getOrigin();
-// if (origin.equals("1")){
-// if (!STA_WORK_CU_CAR_FOUR.contains(wrkMast.getStaNo())){
-// continue;
-// }
-// }else {
-// if (!STA_WORK_CU_CAR_THREE.contains(wrkMast.getStaNo())){
-// continue;
-// }
-// }
-// }else {
-// log.error("鏈煡璇㈠埌宸ヤ綔鏄庣粏");
-// continue;
-// }
-// }
-////
-// boolean wrkTypeSign = fullKM(wrkMast);
-// if (!Cools.isEmpty(wrkMast)){
-// if (wrkTypeSign) {
-// ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
-// if (result.getCode()==200){
-// continue;
-// }else {
-// System.out.println(staNo+"澶辫触4锛�");
-// }
-// }
-// }
-// }
-// }
-//
-// for(Integer staNo : STA_WORK_CU){
-// BasDevp basDevp = basDevpService.selectById(staNo);
-// if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
-// List<Integer> STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR;
-// WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
-// if(Cools.isEmpty(wrkMast)){
-// continue;
-// }
-// if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=104){
-// continue;
-// }
-// if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
-// continue;
-// }
-// Integer wrkMastStaNo = wrkMast.getStaNo();
-// if (wrkMastStaNo<118 || wrkMastStaNo>121){
-// continue;
-// }
-// String origin = null;
-// boolean sign = false;
-// if (wrkMast.getIoType()!=101){
-// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-// if (wrkDetls.size()!=0){
-// origin = wrkDetls.get(0).getOrigin();
-// if (origin.equals("1")){
-// if (!STA_WORK_CU_CAR_FOUR.contains(wrkMastStaNo)){
-// sign = true;
-// }
-// }else {
-// if (!STA_WORK_CU_CAR_THREE.contains(wrkMastStaNo)){
-// sign = true;
-// }
-// }
-// }else {
-// log.error("鏈煡璇㈠埌宸ヤ綔鏄庣粏");
-// continue;
-// }
-// }
-// int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMastStaNo).or().eq("sta_end", wrkMastStaNo));
-// if (count!=0){
-// continue;
-// }
-// int countStart = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNo).or().eq("sta_end", staNo).or().eq("wrk_no", wrkMast.getWrkNo()));
-// if (countStart!=0){
-// continue;
-// }
-// RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
-// if (rgvOneSign.getRgvOneSign()==1){
-// STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR_TWO;
-// }
-//
-// BasDevp basDevpEnd = basDevpService.selectById(wrkMastStaNo);
-// if (sign || !basDevpEnd.getLoading().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0) {
-// for (Integer staNoOther : STA_WORK_CU_CAR_NOW) {
-// if (staNoOther.equals(wrkMastStaNo)) continue;
-//
-// if (sign){
-// if (origin.equals("1")){
-// if (!STA_WORK_CU_CAR_FOUR.contains(staNoOther)){
-// continue;
-// }
-// }else {
-// if (!STA_WORK_CU_CAR_THREE.contains(staNoOther)){
-// continue;
-// }
-// }
-// }
-//
-// int countOther = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", staNoOther).or().eq("sta_end", staNoOther));
-// if (countOther!=0){
-// continue;
-// }
-// BasDevp basDevpOther = basDevpService.selectById(staNoOther);
-// if (!basDevpOther.getLoading().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
-// continue;
-// }
-// wrkMast.setStaNo(staNoOther);
-// wrkMastService.updateById(wrkMast);
-// log.info("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"淇敼鐩爣绔欎负:"+staNoOther+";鍘熺洰鏍囩珯涓�:"+wrkMastStaNo);
-// return;
-// }
-// }
-// }
-// }
-// }catch (Exception e){
-// log.error("鐩爣涓烘媶鍨涗綅缃殑浠诲姟鐢熸垚灏忚溅宸ヤ綔妗ｆ澶辫触锛侊紒"+e);
-// }
-// }
-
- public boolean fullKM(WrkMast wrkMast){
- if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
- return true;
- }
- return false;
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java
deleted file mode 100644
index 408c6ab..0000000
--- a/src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.zy.asrs.task;
-
-import com.zy.asrs.entity.WrkMastSta;
-import com.zy.asrs.service.WrkMastStaService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.WrkMastStaLogHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Slf4j
-@Component
-public class WrkMastStaLogScheduler {
-
- @Autowired
- private WrkMastStaLogHandler wrkMastStaLogHandler;
- @Autowired
- private WrkMastStaService wrkMastStaService;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
- List<WrkMastSta> wrkMastStas = wrkMastStaService.selectToBeHistoryData();
- if (wrkMastStas.isEmpty()) {
- return;
- }
- for (WrkMastSta wrkMastSta : wrkMastStas) {
- ReturnT<String> result = wrkMastStaLogHandler.start(wrkMastSta);
- if (!result.isSuccess()) {
- log.error("灏忚溅宸ヤ綔妗ｅ伐浣滄。[workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMastSta.getWrkNo());
- }
- }
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/ArmRulesHandler.java b/src/main/java/com/zy/asrs/task/handler/ArmRulesHandler.java
deleted file mode 100644
index 555f519..0000000
--- a/src/main/java/com/zy/asrs/task/handler/ArmRulesHandler.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.ArmPrecomputeParam;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.BasArmRulesService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.model.MesPakinParam;
-import com.zy.common.model.MesPakoutParam;
-import com.zy.common.model.StartupDto;
-import com.zy.common.utils.HttpHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/7/4
- */
-@Slf4j
-@Service
-@Transactional
-public class ArmRulesHandler extends AbstractHandler<String> {
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private BasArmRulesService basArmRulesService;
-
- @Value("${arm.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${arm.address.QuantityOfPalletizing}")
- //瀹℃牳鍦板潃
- private String QuantityOfPalletizing;
-
- public ReturnT<String> start(ArmPrecomputeParam armPrecomputeParam) {
- try{
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(URL)
- .setPath(QuantityOfPalletizing)
- .setJson(JSON.toJSONString(armPrecomputeParam.getMatList().get(0)))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- JSONObject data = JSON.parseObject(jsonObject.getString("data"));
-
- success = true;
- ArmPrecomputeParam jsonObjectObject = new ArmPrecomputeParam(
- data.getDouble("material_length"),
- data.getDouble("material_width"),
- data.getDouble("material_height"),
- data.getDouble("material_weight"),
- data.getDouble("material_number")
- );
- for (ArmPrecomputeParam.CombMat combMat : jsonObjectObject.getMatList()){
- basArmRulesService.updateStatus(combMat);
- }
- } else {
- log.error("鑾峰彇鐮佸灈鏁伴噺锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+QuantityOfPalletizing, JSON.toJSONString(armPrecomputeParam), response);
- throw new CoolException("鑾峰彇鐮佸灈鏁伴噺澶辫触");
- }
- } catch (Exception e) {
- try{
- log.error("fail==>鑾峰彇鐮佸灈鏁伴噺:"+e.getLocalizedMessage());
- } catch (Exception e1){
-
- }
-// return FAIL.setMsg(e.getLocalizedMessage());
- return FAIL;
-// log.error("fail", e);
-// return FAIL.setMsg(e.getMessage());
- } finally {
- try {
-
- if (success){
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鑾峰彇鐮佸灈鏁伴噺",
- URL +"/"+ QuantityOfPalletizing,
- null,
- "127.0.0.1",
- JSON.toJSONString(armPrecomputeParam),
- response,
- success
- );
- } else {
- beforeBodyWriteCallApiLogSave(
- "鑾峰彇鐮佸灈鏁伴噺",
- URL +"/"+ QuantityOfPalletizing,
- null,
- "127.0.0.1",
- JSON.toJSONString(armPrecomputeParam),
- response,
- success
- );
- }
- } catch (Exception e) { log.error("", e); }
- }
- }catch (Exception e){
-
- }
- return SUCCESS;
- }
- public void beforeBodyWriteCallApiLogSave(String name, String url, String appkey, String ip, String request, String response, boolean success) {
- ApiLog apiLog = apiLogService.selectOne(new EntityWrapper<ApiLog>()
- .eq("namespace", name)
- .eq("request", request)
- .eq("response", response)
- .eq("result", success? 1:0)
- .orderBy("create_time", false)
- );
-
- if (!Cools.isEmpty(apiLog)){
- long parseLong = Long.parseLong(apiLog.getTimestamp());
- if (new Date().getTime()-parseLong<5*1000*60){
- return;
- }
- }
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- name,
- url,
- appkey,
- ip,
- request,
- response,
- success
- );
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java b/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java
new file mode 100644
index 0000000..cf507db
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/AutomaticallyIssueWCSTasksHandler.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.task.handler;
+
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@Transactional
+public class AutomaticallyIssueWCSTasksHandler extends AbstractHandler<String> {
+
+
+ public ReturnT<String> start(WrkMast wrkMast) {
+
+ return SUCCESS;
+ }
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderToLineHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderToLineHandler.java
deleted file mode 100644
index 062ff44..0000000
--- a/src/main/java/com/zy/asrs/task/handler/OrderToLineHandler.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.ApiLog;
-import com.zy.asrs.entity.param.ArmPrecomputeParam;
-import com.zy.asrs.entity.param.OrderToLine;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.BasArmRulesService;
-import com.zy.asrs.service.OrderPakinService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
-import com.zy.common.utils.IpTools;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-@Slf4j
-@Service
-@Transactional
-public class OrderToLineHandler extends AbstractHandler<String> {
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private OrderPakinService orderPakinService;
-
- @Value("${line.address.URL}")
- //绔彛
- private String URL;
-
- @Value("${line.address.PATH}")
- //瀹℃牳鍦板潃
- private String Path;
-
- public ReturnT<String> start(OrderToLine orderToline) {
- try{
- String response = "";
- boolean success = false;
- try {
- Map<String, Object> map = new HashMap<>();
- map.put("appkey","ea1f0459efc02a79f046f982767939ae");
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(URL)
- .setPath(Path)
- .setJson(JSON.toJSONString(orderToline))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
-// orderPakinService.updateOrderStatus(orderToline.getOrderNo()); //鏇存柊璁㈠崟鐘舵�� 0 -> 1
- } else {
- log.error("涓嬪彂鍗曟嵁锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+Path, JSON.toJSONString(orderToline), response);
- throw new CoolException("涓嬪彂鍗曟嵁澶辫触");
- }
- } catch (Exception e) {
- try{
- log.error("fail==>涓嬪彂鍗曟嵁鑷冲垎鎷ｇ嚎:"+e.getLocalizedMessage());
- } catch (Exception e1){
-
- }
-// return FAIL.setMsg(e.getLocalizedMessage());
- return FAIL;
- } finally {
- try {
- if (success){
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "涓嬪彂鍗曟嵁鑷冲垎鎷ｇ嚎",
- URL +"/"+ Path,
- null,
- "127.0.0.1",
- JSON.toJSONString(orderToline),
- response,
- success
- );
- } else {
- beforeBodyWriteCallApiLogSave(
- "涓嬪彂鍗曟嵁鑷冲垎鎷ｇ嚎",
- URL +"/"+ Path,
- null,
- "127.0.0.1",
- JSON.toJSONString(orderToline),
- response,
- success
- );
- }
- } catch (Exception e) { log.error("", e); }
- }
- }catch (Exception e){
-
- }
- return SUCCESS;
- }
-
- public void beforeBodyWriteCallApiLogSave(String name, String url, String appkey, String ip, String request, String response, boolean success) {
- ApiLog apiLog = apiLogService.selectOne(new EntityWrapper<ApiLog>()
- .eq("namespace", name)
- .eq("response", response)
- .eq("result", success? 1:0)
- .orderBy("create_time", false)
- );
-
- if (!Cools.isEmpty(apiLog)){
- long parseLong = Long.parseLong(apiLog.getTimestamp());
- if (new Date().getTime()-parseLong<5*1000*60){
- return;
- }
- }
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- name,
- url,
- appkey,
- ip,
- request,
- response,
- success
- );
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
deleted file mode 100644
index aacc34f..0000000
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.service.*;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Slf4j
-@Service
-@Transactional
-public class WrkMastAgvHandler extends AbstractHandler<String>{
- @Autowired
- private BasAgvMastService basAgvMastService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private BasAgvLocDetlService basAgvLocDetlService;
- @Autowired
- private BasAgvWrkDetlService basAgvWrkDetlService;
- @Autowired
- private LocMastService locMastService;
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private OpenService openService;
-
-
- public ReturnT<String> start(BasAgvMast basAgvMast) {
- try {
- Date now = new Date();
- switch (basAgvMast.getIoType()){
- case 0:
- LocMast sourceLoc0 = locMastService.selectById(basAgvMast.getSourceLocNo());
- locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", sourceLoc0.getLocNo()));
- if(basAgvMast.getFloorNo() == 4){
- basAgvMast.setBarcode(sourceLoc0.getBarcode());
- basAgvMastService.updateById(basAgvMast);
- }
- sourceLoc0.setLocSts("O");
- sourceLoc0.setBarcode("");
- sourceLoc0.setModiTime(now);
- sourceLoc0.setIoTime(now);
- if (!locMastService.updateById(sourceLoc0)) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [TaskNo=" + basAgvMast.getTaskNo() + "],[locNo=" + basAgvMast.getSourceLocNo() + "]");
- }
- basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getSourceLocNo()));
- basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
- basAgvMast.setStatus(3);
- if(basAgvMastService.updateById(basAgvMast)){
- openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
- }
- break;
- case 1:
- LocMast sourceLoc1 = locMastService.selectById(basAgvMast.getSourceLocNo());
- LocMast locMast1 = locMastService.selectById(basAgvMast.getLocNo());
- List<BasAgvLocDetl> locDetls1 = basAgvLocDetlService.selectList(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
- // 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
- locMast1.setLocSts("F");
- locMast1.setBarcode(sourceLoc1.getBarcode());
- locMast1.setIoTime(now);
- locMast1.setModiTime(now);
- if (!locMastService.updateById(locMast1)) {
-// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐�; [TaskNo=" + basAgvMast.getTaskNo() + "],[locNo=" + basAgvMast.getLocNo() + "]");
- }
- try{
- // 杞Щ搴撳瓨鏄庣粏鏁版嵁: 搴撳瓨鍙� 鐢卞伐浣滄。婧愬簱浣嶅彉涓虹洰鏍囧簱浣�
- basAgvLocDetlService.updateLocNo(basAgvMast.getLocNo(), basAgvMast.getSourceLocNo());
- } catch (Exception e) {
- return FAIL.setMsg(e.getMessage());
- }
- if (null != sourceLoc1) {
- sourceLoc1.setBarcode("");
- sourceLoc1.setLocSts("O");
- sourceLoc1.setModiTime(now);
- sourceLoc1.setIoTime(now);
- if (!locMastService.updateById(sourceLoc1)) {
-// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLoc={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("搴撲綅绉昏浆 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [TaskNo=" + basAgvMast.getTaskNo() + "],[locNo=" + basAgvMast.getLocNo() + "]");
- }
- }
-
- basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
-// basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
- basAgvMast.setStatus(4);
- basAgvMastService.updateById(basAgvMast);
-// openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
- break;
- case 2:
- List<BasAgvLocDetl> locDetls2 = basAgvLocDetlService.selectList(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
- if (!locDetls2.isEmpty()) {
- basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
- }
-
- LocMast locMast2 = locMastService.selectById(basAgvMast.getLocNo());
- // 淇敼搴撲綅鐘舵�� S ====>> F
- if (locMast2.getLocSts().equals("S") ) {
- locMast2.setLocSts("F");
- locMast2.setIoTime(now);
- locMast2.setModiTime(now);
- } else if(basAgvMast.getTaskNo()>10000){
- locMast2.setLocSts("D");
- locMast2.setIoTime(now);
- locMast2.setModiTime(now);
- } else {
- return FAIL.setMsg("搴撲綅鐘舵�佸紓甯�");
- }
- List<LocDetl> locDetlList1 = new ArrayList<>();
- List<BasAgvLocDetl> locDetlList2 = new ArrayList<>();
- List<BasAgvWrkDetl> basAgvWrkDetlList = basAgvWrkDetlService.selectList(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
- if (!basAgvWrkDetlList.isEmpty()){
- for (BasAgvWrkDetl wrkDetl : basAgvWrkDetlList){
- BasAgvLocDetl locDetl = new BasAgvLocDetl();
- locDetl.sync(wrkDetl);
- locDetl.setLocNo(basAgvMast.getLocNo()); // 搴撲綅鍙�
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- locDetl.setModiTime(now);
- locDetl.setAppeTime(now);
- locDetl.setOrigin("鍦ㄥ簱");
- locDetlList2.add(locDetl);
-
- }
- } else {
- locMast2.setLocSts("D");
- }
- if (!locMastService.updateById(locMast2)) {
- return FAIL;
- }
- if (!locDetlList2.isEmpty()){
- for (BasAgvLocDetl locDetlold : locDetlList2) {
- BasAgvLocDetl locDetl = basAgvLocDetlService.selectItem(basAgvMast.getLocNo(), locDetlold.getMatnr(), locDetlold.getBatch(),locDetlold.getBrand()
- ,locDetlold.getStandby1(),locDetlold.getStandby2(),locDetlold.getStandby3(),locDetlold.getBoxType1(),locDetlold.getBoxType2(),locDetlold.getBoxType3());
- if (null != locDetl) {
- if (!basAgvLocDetlService.updateAnfme(locDetlold.getAnfme(), basAgvMast.getLocNo(), locDetlold.getMatnr(), locDetlold.getBatch(),locDetlold.getBrand(),locDetlold.getStandby1(),locDetlold.getStandby2(),locDetlold.getStandby3()
- ,locDetlold.getBoxType1(),locDetlold.getBoxType2(),locDetlold.getBoxType3())) {
- }
- } else {
- if (!basAgvLocDetlService.insert(locDetlold)) {
- }
- }
- }
- }
-
- basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getSourceLocNo()));
- basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
- basAgvMast.setStatus(3);
- if(basAgvMast.getFloorNo() == 2 || basAgvMast.getFloorNo() == 3){
- basAgvMast.setStatus(4);
- }
- basAgvMastService.updateById(basAgvMast);
- openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
- break;
- case 3:
- basAgvMast.setStatus(3);
- basAgvMastService.updateById(basAgvMast);
- openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
- break;
- default:
- return FAIL.setMsg("鏆備笉鏀寔璇ョ被鍨�");
- }
-
- } catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
deleted file mode 100644
index 88eba6e..0000000
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.WrkMastSta;
-import com.zy.asrs.service.WrkMastStaService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-
-/**
- * Created by Monkey D. Luffy on 2023.11.21
- * 寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐.............宸ヤ綔妗ｇ敓鎴怰GV灏忚溅浠诲姟
- */
-@Slf4j
-@Service
-@Transactional
-public class WrkMastStaInItHandler extends AbstractHandler<String> {
- @Autowired
- private WrkMastStaService wrkMastStaService;
-
- public ReturnT<String> start(WrkMast wrkMast,BasDevp basDevp,Integer type) {
- try {
- WrkMastSta wrkMastSta = null;
- if(wrkMast != null){
- wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
- }
- if(basDevp.getWrkNo() != null){
- wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", basDevp.getWrkNo().longValue()));
- }
-
- if (!Cools.isEmpty(wrkMastSta) ){
- return SUCCESS;
- }
- switch (type){
- case 21://鍏ュ簱
- if (Cools.isEmpty(wrkMastSta)){
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
- switch (wrkMast.getStaNo()){
- case 1001:wrkMastSta1.setStaEnd(1004);break;
- case 1011:wrkMastSta1.setStaEnd(1014);break;
- case 1015:wrkMastSta1.setStaEnd(1018);break;
- case 1025:wrkMastSta1.setStaEnd(1028);break;
- case 1032:wrkMastSta1.setStaEnd(1035);break;
- case 2037:wrkMastSta1.setStaEnd(2037);break;
- case 4001:wrkMastSta1.setStaEnd(4001);break;
- }
- wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
- wrkMastSta1.setWrkType(5);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
- wrkMastStaService.insert(wrkMastSta1);
- };
- break;
- case 22://鍑哄簱
- if (Cools.isEmpty(wrkMastSta)){
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
- wrkMastSta1.setWrkNo(Long.valueOf(wrkMast.getWrkNo()));
- if(wrkMast.getIoType() == 57 || wrkMast.getIoType() == 53){
- switch (wrkMast.getCrnNo()) {
- case 1:
- if (wrkMast.getStaNo() < 2000) {
- wrkMastSta1.setStaEnd(1004);
- break;
- } else {
- wrkMastSta1.setStaEnd(2006);
- break;
- }
- case 2:
- if (wrkMast.getStaNo() < 2000) {
- wrkMastSta1.setStaEnd(1014);
- break;
- } else {
- wrkMastSta1.setStaEnd(2012);
- break;
- }
- case 4:
- if (wrkMast.getStaNo() < 2000) {
- wrkMastSta1.setStaEnd(1028);
- break;
- } else {
- wrkMastSta1.setStaEnd(2024);
- break;
- }
- case 5:
- if (wrkMast.getStaNo() < 2000) {
- wrkMastSta1.setStaEnd(1035);
- break;
- } else {
- wrkMastSta1.setStaEnd(2030);
- break;
- }
- }
- }else{
- switch ((wrkMast.getStaNo())){
- case 1108:wrkMastSta1.setStaEnd(1109);break;
- case 4006:
- if(wrkMastSta1.getStaStart()>2000){
- wrkMastSta1.setStaEnd(2018);break;
- }else{
- wrkMastSta1.setStaEnd(1018);break;
- }
- }
- }
- wrkMastSta1.setType(fullKM(wrkMast)? 1:2);
- wrkMastSta1.setWrkType(6);//宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
- wrkMastStaService.insert(wrkMastSta1);
- };
- break;
- case 23://寮傚父閫�鍑�
- WrkMast wrkMast23 = new WrkMast();
- wrkMast23.setWrkNo(basDevp.getWrkNo());
- wrkMast23.setSourceStaNo(basDevp.getDevNo());
- wrkMast23.setStaNo(1041);
-
- WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast23,new Date(),basDevp);
- wrkMastSta1.setType(2);
- wrkMastSta1.setWrkType(6);
- wrkMastStaService.insert(wrkMastSta1);
- default:
- return SUCCESS;
- }
-
- }catch (Exception e){
- log.error("寮傚父锛侊紒锛�"+e);
- return FAIL;
- }
- return SUCCESS;
- }
-
- public boolean fullKM(WrkMast wrkMast){
- if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
- return true;
- }
- return false;
- }
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastStaLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastStaLogHandler.java
deleted file mode 100644
index 5bf397a..0000000
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastStaLogHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.WrkMastSta;
-import com.zy.asrs.service.WrkMastLogService;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.service.WrkMastStaLogService;
-import com.zy.asrs.service.WrkMastStaService;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import java.util.Iterator;
-import java.util.List;
-
-@Slf4j
-@Service
-@Transactional
-public class WrkMastStaLogHandler extends AbstractHandler<String>{
- @Autowired
- private WrkMastStaService wrkMastStaService;
- @Autowired
- private WrkMastStaLogService wrkMastStaLogService;
- public ReturnT<String> start(WrkMastSta wrkMastSta) {
- try {
-
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastStaLogService.save(wrkMastSta.getWrkNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMastSta.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔涓绘。
- if (!wrkMastStaService.deleteById(wrkMastSta)) {
- exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMastSta.getWrkNo());
- }
- } catch (Exception e) {
- log.error("fail", e);
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
-}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e675f77..a719724 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -79,19 +79,11 @@
comb:
limit: 5000
-#arm瀵规帴
-arm:
- # 鍦板潃
- address:
- URL: http://10.10.10.171:7002
- #鏍规嵁鍙傛暟鑾峰彇鐮佸灈鏁伴噺
- QuantityOfPalletizing: adaptor/api/wcs/getPalletizingNumber
-#鍒嗘嫞绾垮鎺�
-line:
- # 鍦板潃
- address:
- URL: http://10.10.10.244:8080
- PATH: orderPakInAll
+#mes瀵规帴
+mes:
+ url: 127.0.0.1:8080
+ #绔欑偣鑾峰彇鎺ュ彛
+ stationaddress: 123
#erp瀵规帴
erp:
--
Gitblit v1.9.1