From 6c5963052282dfe4ae2f20d2e18012d1cff93c85 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 23 六月 2025 08:54:51 +0800
Subject: [PATCH] rgv调度优化
---
src/main/java/com/zy/common/service/CommonService.java | 122 +---------------------------------------
1 files changed, 4 insertions(+), 118 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 3dd49c3..9057871 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,23 +1,19 @@
package com.zy.common.service;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-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;
+import com.zy.core.properties.SlaveProperties;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.List;
/**
* 璐ф灦鏍稿績鍔熻兘
* Created by vincent on 2020/6/11
*/
+@Slf4j
@Service
public class CommonService {
@@ -25,20 +21,9 @@
private WrkMastService wrkMastService;
@Autowired
private WrkLastnoService wrkLastnoService;
- @Autowired
- private RowLastnoService rowLastnoService;
- @Autowired
- private BasCrnpService basCrnpService;
- @Autowired
- private StaDescService staDescService;
- @Autowired
- private BasDevpService basDevpService;
- @Autowired
- private LocMastService locMastService;
/**
* 鐢熸垚宸ヤ綔鍙�
- * @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
* @return workNo(宸ヤ綔鍙�)
*/
public int getWorkNo(Integer wrkMk) {
@@ -75,105 +60,6 @@
return workNo;
}
- /**
- * 妫�绱㈠簱浣嶅彿
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞宸ヤ綔绫诲瀷
- * @param sourceStaNo 婧愮珯
- * @param matNos 鐗╂枡鍙烽泦鍚�
- * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
- */
- 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("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
- if (whsType == 1 || whsType == 2){
- int curRow = rowLastno.getCurrentRow();
- int sRow = rowLastno.getsRow();
- int eRow = rowLastno.geteRow();
-
- // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
- curRow = curRow == sRow ? eRow : sRow;
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo;
- switch (whsType) {
- case 1:
- crnNo = 1;
- break;
- case 2:
- crnNo = 2;
- break;
- default:
- throw new CoolException("妫�绱㈠簱浣� -- 妫�绱㈠爢鍨涙満鍙峰け璐�");
- }
-
- basCrnpService.checkSiteStatus(crnNo);
- // 鑾峰彇鐩爣绔�
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
- StaDesc staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
- BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
- int inQty = staNo.getInQty()==null?0:staNo.getInQty();
- if (staNo.getAutoing().equals("Y") && inQty<2) {
- // 鏌ユ壘搴撲綅
- LocMast locMast = locMastService.queryFreeLocMast(curRow);
- if (Cools.isEmpty(locMast)) {
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
- String locNo = locMast.getLocNo();
-
- // 鏇存柊搴撲綅鎺掑彿
- rowLastno.setCurrentRow(curRow);
- rowLastnoService.updateById(rowLastno);
-
- // 杩斿洖dto
- startupDto.setCrnNo(crnNo);
- startupDto.setSourceStaNo(sourceStaNo);
- startupDto.setStaNo(staNo.getDevNo());
- startupDto.setLocNo(locNo);
- } else {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- }
- } else {
- throw new CoolException(rowLastno.getWhsType()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤");
- }
- return startupDto;
- }
-
- public static void main(String[] args) {
- System.out.println(Arith.remainder(1, 4));
- System.out.println("0200201".substring(0, 2));
- String locNo = "0800201";
- int row = Integer.parseInt(locNo.substring(0, 2));
- double remainder = Arith.remainder(row, 4);
- int targetRow;
- if (remainder == 1) {
- // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
- targetRow = row + 1;
- } else if (remainder == 0) {
- // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
- targetRow = row - 1;
- } else {
- return;
- }
- String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
- System.out.println(zerofill);
- }
-
public static String zerofill(String msg, Integer count) {
if (msg.length() == count) {
return msg;
@@ -188,4 +74,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1