From 9ced6732cf2d379f9b9d09c9f8f82fb60529d113 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十二月 2020 15:45:15 +0800
Subject: [PATCH] #newVersion
---
src/main/java/com/zy/common/model/StartupDto.java | 34 +-------
/dev/null | 22 -----
src/main/java/com/zy/asrs/domain/enums/WorkNoType.java | 48 ++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 31 +------
src/main/java/com/zy/common/service/CommonService.java | 80 +++++--------------
5 files changed, 81 insertions(+), 134 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TestController.java b/src/main/java/com/zy/asrs/controller/TestController.java
deleted file mode 100644
index 4294fe3..0000000
--- a/src/main/java/com/zy/asrs/controller/TestController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.zy.asrs.service.impl.MainServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by vincent on 2020/9/12
- */
-@RestController
-public class TestController {
-
- @Autowired
- private MainServiceImpl mainService;
-
- @GetMapping("/test")
- public String test(){
- mainService.test();
- return "ok";
- }
-}
diff --git a/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java b/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java
new file mode 100644
index 0000000..4aa3911
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java
@@ -0,0 +1,48 @@
+package com.zy.asrs.domain.enums;
+
+import com.core.exception.CoolException;
+
+/**
+ * 宸ヤ綔鍙锋帓搴忚鍒�
+ */
+public enum WorkNoType {
+
+ PAKIN(0),
+ PICK(1),
+ PAKOUT(2),
+ OTHER(3),
+ ;
+
+ public Integer type;
+
+ WorkNoType(Integer type) {
+ this.type = type;
+ }
+
+ public static Integer getWorkNoType(Integer ioType) {
+ switch (ioType) {
+ case 1:
+ return PAKIN.type;
+ case 10:
+ return PAKIN.type;
+ case 11:
+ return PICK.type;
+ case 53:
+ case 54:
+ case 57:
+ return PICK.type;
+ case 101:
+ return PAKOUT.type;
+ case 103:
+ case 104:
+ case 107:
+ return PICK.type;
+ case 110:
+ return PAKOUT.type;
+ default:
+ break;
+ }
+ throw new CoolException(ioType + "鐨勪换鍔＄被鍨嬫棤娉曠敓鎴愬伐浣滃彿");
+ }
+
+}
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 ef829aa..1869f0d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.WaitPakinMapper;
@@ -16,6 +17,7 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.CollectionUtils;
import com.zy.core.CrnThread;
+import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
@@ -29,7 +31,6 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
-import com.zy.core.DevpThread;
import com.zy.core.thread.LedThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,24 +57,6 @@
@Autowired
private RowLastnoService rowLastnoService;
-
- public void test(){
- try {
- // 宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(0);
- System.out.println(workNo);
- if (workNo > 0) {
- throw new CoolException("21321");
- }
- RowLastno rowLastno = rowLastnoService.selectById(1);
- rowLastno.setCurrentRow(rowLastno.getCurrentRow() + 1);
- rowLastnoService.updateById(rowLastno);
- System.out.println(rowLastno.getCurrentRow());
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }
- }
@Autowired
private CommonService commonService;
@@ -145,11 +128,11 @@
}
try {
- // 宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(0);
// 妫�绱㈠簱浣�
List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
StartupDto startupDto = commonService.getLocNo(1, 1, inSta.getStaNo(), matNos);
+ // 宸ヤ綔鍙�
+ int workNo = startupDto.getWorkNo();
// 鎻掑叆宸ヤ綔鏄庣粏妗�
wrkDetlService.createWorkDetail(workNo, waitPakins, barcode);
@@ -859,10 +842,10 @@
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
&& staProtocol.isEmptyMk() && staProtocol.getWorkNo() == 0 && staProtocol.isPakMk()) {
- // 宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(0);
// 妫�绱㈠簱浣�
StartupDto startupDto = commonService.getLocNo(1, 10, emptyInSta.getStaNo(), null);
+ // 宸ヤ綔鍙�
+ int workNo = startupDto.getWorkNo();
try {
// 鎻掑叆宸ヤ綔涓绘。
@@ -1061,7 +1044,7 @@
String locNo = loc.getLocNo();
// 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(0);
+ int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
// 淇濆瓨宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
diff --git a/src/main/java/com/zy/common/model/StartupDto.java b/src/main/java/com/zy/common/model/StartupDto.java
index dacec79..b0ecc3e 100644
--- a/src/main/java/com/zy/common/model/StartupDto.java
+++ b/src/main/java/com/zy/common/model/StartupDto.java
@@ -1,8 +1,11 @@
package com.zy.common.model;
+import lombok.Data;
+
/**
* Created by vincent on 2020/6/11
*/
+@Data
public class StartupDto {
private Integer sourceStaNo;
@@ -13,35 +16,6 @@
private String locNo;
- public Integer getSourceStaNo() {
- return sourceStaNo;
- }
+ private Integer workNo;
- public void setSourceStaNo(Integer sourceStaNo) {
- this.sourceStaNo = sourceStaNo;
- }
-
- public Integer getStaNo() {
- return staNo;
- }
-
- public void setStaNo(Integer staNo) {
- this.staNo = staNo;
- }
-
- public Integer getCrnNo() {
- return crnNo;
- }
-
- public void setCrnNo(Integer crnNo) {
- this.crnNo = crnNo;
- }
-
- public String getLocNo() {
- return locNo;
- }
-
- public void setLocNo(String locNo) {
- this.locNo = locNo;
- }
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 1091368..e0b307b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -5,6 +5,7 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.model.StartupDto;
@@ -89,6 +90,13 @@
*/
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
StartupDto startupDto = new StartupDto();
+ int workNo = getWorkNo(WorkNoType.getWorkNoType(staDescId));
+ startupDto.setWorkNo(workNo);
+ if (sourceStaNo < 100) {
+ whsType = 1;
+ } else {
+ whsType = 2;
+ }
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -97,62 +105,20 @@
int curRow = rowLastno.getCurrentRow();
int sRow = rowLastno.getsRow();
int eRow = rowLastno.geteRow();
- int crn_qty = rowLastno.getCrnQty();
- int rowCount = eRow - sRow + 1;
+
+ // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
+ curRow = curRow == sRow ? eRow : sRow;
// 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
- // 鐩爣搴撲綅
- LocMast locMast = null;
-
- // 鍚屼竴澶╁悓瑙勬牸璐х墿闈犺繎鎽嗘硶瑙勫垯
-// if (!Cools.isEmpty(matNos)) {
-// List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0));
-// for (String locNo : locNos) {
-// // 鑾峰彇鎺�
-// int row = Integer.parseInt(locNo.substring(0, 2));
-// // 鍒ゆ柇鏄惁涓烘繁搴撲綅
-// double remainder = Arith.remainder(row, rowCount / crn_qty);
-// int targetRow;
-// if (remainder == 1) {
-// // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
-// targetRow = row + 1;
-// } else if (remainder == 0) {
-// // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
-// targetRow = row - 1;
-// } else {
-// continue;
-// }
-// String targetLocNo = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
-// // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
-// LocMast targetLocMast = locMastService.selectById(targetLocNo);
-// if (targetLocMast != null && targetLocMast.getLocSts().equals("O")) {
-// locMast = targetLocMast;
-// crnNo = locMast.getCrnNo();
-// break;
-// }
-// }
-// }
-
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙� todo:luxiaotao
- if (curRow == sRow) {
- curRow = eRow;
- } else {
- curRow = sRow;
- }
- crnNo = whsType;
-// Shelves shelves = new Shelves(rowCount, crn_qty);
-// curRow = shelves.start(curRow);
-// if (curRow < 0) {
-// throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
-// }
-// for (List<Integer> node : shelves.nodes){
-// if (node.contains(curRow)) {
-// crnNo = shelves.nodes.indexOf(node) + 1;
-// break;
-// }
-// }
+ int crnNo;
+ switch (whsType) {
+ case 1:
+ crnNo = 1;
+ break;
+ case 2:
+ crnNo = 2;
+ break;
+ default:
+ throw new CoolException("妫�绱㈠簱浣� -- 妫�绱㈠爢鍨涙満鍙峰け璐�");
}
basCrnpService.checkSiteStatus(crnNo);
@@ -169,9 +135,7 @@
int inQty = staNo.getInQty()==null?0:staNo.getInQty();
if (staNo.getAutoing().equals("Y") && inQty<2) {
// 鏌ユ壘搴撲綅
- if (locMast == null) {
- locMast = locMastService.queryFreeLocMast(curRow);
- }
+ LocMast locMast = locMastService.queryFreeLocMast(curRow);
if (Cools.isEmpty(locMast)) {
throw new CoolException("娌℃湁绌哄簱浣�");
}
--
Gitblit v1.9.1