From 8fbd60d7e7fc0e35b3bff5a0c63e2d1bd80be8cf Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期四, 27 十一月 2025 08:08:40 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/common/service/CommonService.java | 344 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 280 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 9c1a0d7..6711f06 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -3,17 +3,14 @@
import com.alibaba.fastjson.JSON;
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.entity.*;
-import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MatServiceImpl;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
@@ -21,10 +18,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
/**
@@ -58,6 +53,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
+ *
* @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
@@ -70,17 +66,17 @@
int workNo = wrkLastno.getWrkNo();
int sNo = wrkLastno.getSNo();
int eNo = wrkLastno.getENo();
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
while (true) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (null != wrkMast) {
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
} else {
break;
}
}
// 淇敼搴忓彿璁板綍
- if (workNo > 0){
+ if (workNo > 0) {
wrkLastno.setWrkNo(workNo);
wrkLastnoService.updateById(wrkLastno);
}
@@ -88,7 +84,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectById(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -97,14 +93,14 @@
//鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
@Transactional
- public StartupDto getScanBarcodeEmptyBoard(){
+ public StartupDto getScanBarcodeEmptyBoard() {
StartupDto startupDto = new StartupDto();
Integer staNo = 0;
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216))<2){
- staNo=216;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216)) < 2) {
+ staNo = 216;
}
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220))<2){
- staNo=220;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220)) < 2) {
+ staNo = 220;
}
startupDto.setStaNo(staNo);
@@ -122,14 +118,8 @@
*/
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
- whsType = Utils.GetWhsType(sourceStaNo);
- return getLocNo(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
- }
-
- @Transactional
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto,String barcode) {
whsType = Utils.GetWhsType(sourceStaNo);
- return getLocNo1(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0,barcode);
+ return getLocNo(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
}
/**
@@ -172,12 +162,12 @@
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
crnNumber = moveCrnNo;
- if (times==0){
- curRow = moveCrnNo*4-1;
- }else {
- curRow = moveCrnNo*4-2;
+ if (times == 0) {
+ curRow = moveCrnNo * 4 - 1;
+ } else {
+ curRow = moveCrnNo * 4 - 2;
}
}
@@ -187,7 +177,7 @@
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
if (basCrnpService.checkSiteError(crnNo, true)) {
- rowCount = locNecessaryParameters[0];
+ rowCount = locNecessaryParameters[0];
nearRow = locNecessaryParameters[3];
break;
} else {
@@ -211,19 +201,19 @@
signRule2 = true;
}
- if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
+ if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
signRule1 = true;
}
- if (signRule1){
+ if (signRule1) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
- for (LocMast locMast1:locMasts){
+ for (LocMast locMast1 : locMasts) {
if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",shallowLoc));
- if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")){
+ String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
+ if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
locMast = locMast1;
@@ -231,8 +221,8 @@
}
}
}
- }else if (signRule2){
- List<String> locNos = locDetlService.getSameDetlToday(matnr,batch, sRow, eRow);
+ } else if (signRule2) {
+ List<String> locNos = locDetlService.getSameDetlToday(matnr, batch, sRow, eRow);
for (String locNo : locNos) {
if (Utils.isShallowLoc(slaveProperties, locNo)) {
continue;
@@ -326,17 +316,66 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ List<LocMast> locMasts = new ArrayList<>();
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
+ .eq("loc_sts", "O")
+ .eq("loc_type1",locTypeDto.getLocType1()));
+ if (Cools.isEmpty(locMasts) || locMasts.size() <= 5){
+ if (nearRow == 2){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
+ .eq("loc_sts", "O")
+ .eq("loc_type1",locTypeDto.getLocType1()));
+ }else if (nearRow == 3){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
+ .eq("loc_sts", "O")
+ .eq("loc_type1",locTypeDto.getLocType1()));
+
+ }
+ }
+ if (locMasts.size() <= 5){
+ throw new CoolException("鏃犵┖搴撲綅鍙敤");
+ }
+ List<LocMast> locMastList = new ArrayList<>();
+ locMasts.sort(new Comparator<LocMast>() {
+ @Override
+ public int compare(LocMast o1, LocMast o2) {
+ int b1 = o1.getBay1();
+ int b2 = o2.getBay1();
+ if (o1.getBay1() >= 15) {
+ b1 = Math.abs(15 - o1.getBay1());
+ }
+ if (o2.getBay1() >= 15) {
+ b2 = Math.abs(15 - o2.getBay1());
+ }
+ return b2 - b1;
+ }
+ });
+
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
- if (!Cools.isEmpty(locMast2)) {
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
+ if (Cools.isEmpty(locMast2)){
+ continue;
+ }
+ if (locMast2.getLocSts().equals("P")||locMast2.getLocSts().equals("Q")||locMast2.getLocSts().equals("R")||locMast2.getLocSts().equals("S")){
+ continue;
+ }
+ if (!Cools.isEmpty(locMast2)&&locMast2.getLocSts().equals("O")){
locMast = locMast2;
break;
}
+ if (!Cools.isEmpty(locMast2)&&(locMast2.getLocSts().equals("F")||locMast2.getLocSts().equals("D"))){
+ locMast = locMast1;
+ break;
+ }
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+// if (Cools.isEmpty(locMast2)) {
+// locMast = locMast1;
+// break;
+// }
}
}
@@ -349,7 +388,7 @@
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount) {
times = times + 1;
- return getLocNo(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNo(1, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times);
}
// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
// if (locTypeDto.getLocType1() < 2) {
@@ -372,16 +411,76 @@
return startupDto;
}
- /*
- * 妫�绱㈠簱浣嶅彿
- * */
@Transactional
- public StartupDto getLocNo1(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times,String barcode){
+ public StartupDto getLocNoEmpty(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
+ whsType = Utils.GetWhsType(sourceStaNo);
+ return getLocNoEmpty(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
+ }
+
+ @Transactional
+ public StartupDto getLocNoEmpty(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
+ matnr = "";
+ }
+ if (Cools.isEmpty(batch)) { //绠卞彿
+ batch = "";
+ }
+ if (Cools.isEmpty(grade)) { //澶囩敤
+ grade = "";
+ }
+
+ // 鍒濆鍖栧弬鏁�
+ int crnNo = 0; //鍫嗗灈鏈哄彿
+ int nearRow = 0; //鏈�娴呭簱浣嶆帓
+ int curRow = 0; //鏈�娣卞簱浣嶆帓
+ int rowCount = 0; //杞杞
+ LocMast locMast = null; // 鐩爣搴撲綅
+
StartupDto startupDto = new StartupDto();
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ int crnNumber = rowLastno.getCrnQty();
+
+ if (Cools.isEmpty(rowLastno)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ // ===============>>>> 寮�濮嬫墽琛�
+ curRow = rowLastno.getCurrentRow();
+
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
+ crnNumber = moveCrnNo;
+ if (times == 0) {
+ curRow = moveCrnNo * 4 - 1;
+ } else {
+ curRow = moveCrnNo * 4 - 2;
+ }
+ }
+
+ //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+ for (int i = times; i < crnNumber; i++) {
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber);
+ curRow = locNecessaryParameters[1];
+ crnNo = locNecessaryParameters[2];
+ if (basCrnpService.checkSiteError(crnNo, true)) {
+ rowCount = locNecessaryParameters[0];
+ nearRow = locNecessaryParameters[3];
+ break;
+ } else {
+ times++;
+ }
+ }
+ if (nearRow == 0) {
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ }
+
+ boolean signRule1 = false;
+ boolean signRule2 = false;
+
Wrapper<StaDesc> wrapper = null;
StaDesc staDesc = null;
BasDevp staNo = null;
- int crnNo = 1; //鍫嗗灈鏈哄彿
+
if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
// 鑾峰彇鐩爣绔�
wrapper = new EntityWrapper<StaDesc>()
@@ -391,32 +490,149 @@
staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
-// crnNo = 0;
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ crnNo = 0;
}
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
-// crnNo = 0;
+// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ crnNo = 0;
}
startupDto.setStaNo(staNo.getDevNo());
}
- int workNo = getWorkNo(0);
- startupDto.setWorkNo(workNo);
- startupDto.setSourceStaNo(sourceStaNo);
- startupDto.setCrnNo(1);
- //绗竴娆″叆搴�
- //鍚庣画鍏ュ簱锛堟墭鐩樺拰搴撲綅宸茬粡缁戝畾锛�
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", barcode));
- if (locMast != null){
- if (!locMast.getLocSts().equals("O")){
- log.error("涓庤鎵樼洏缁戝畾鐨勫簱浣嶅凡琚崰鐢紝鎵樼洏鐮侊細{}锛屽簱浣嶅彿锛歿}",barcode,locMast.getLocNo());
- } else {
- startupDto.setLocNo(locMast.getLocNo());
- }
- } else {
- //鎵樼洏涓庡簱浣嶆湭缁戝畾 璧扮涓�娆″叆搴撻�昏緫
+
+ // 鏇存柊搴撲綅鎺掑彿
+ if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
}
+
+ // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+
+ // 1.鎸夎鍒欐煡鎵惧簱浣�
+ if (Cools.isEmpty(locMast) && crnNo != 0) {
+ List<LocMast> locMasts = new ArrayList<>();
+ List<LocMast> locMastsLow2 = new ArrayList<>();
+ List<LocMast> locMastsLow3 = new ArrayList<>();
+ locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 2)
+ .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
+ locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 3)
+ .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
+ if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
+ .eq("loc_sts", "O").ge("lev1",8));
+ if (Cools.isEmpty(locMasts)){
+ if (nearRow == 2){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
+ .eq("loc_sts", "O").ge("lev1",8));
+ }else if (nearRow == 3){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
+ .eq("loc_sts", "O").ge("lev1",8));
+
+ }
+ }
+ }else {
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
+ .eq("loc_sts", "O"));
+ if (Cools.isEmpty(locMasts)){
+ if (nearRow == 2){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
+ .eq("loc_sts", "O"));
+ }else if (nearRow == 3){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
+ .eq("loc_sts", "O"));
+
+ }
+ }
+ }
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
+// .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
+// if (Cools.isEmpty(locMasts) || locMasts.size() <= 5){
+// if (nearRow == 2){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
+// .eq("loc_sts", "O"));
+// }else if (nearRow == 3){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
+// .eq("loc_sts", "O"));
+//
+// }
+// }
+ if (locMasts.size() <= 5){
+ throw new CoolException("鏃犵┖搴撲綅鍙敤");
+ }
+ List<LocMast> locMastList = new ArrayList<>();
+ locMasts.sort(new Comparator<LocMast>() {
+ @Override
+ public int compare(LocMast o1, LocMast o2) {
+ int b1 = o1.getBay1();
+ int b2 = o2.getBay1();
+ if (o1.getBay1() >= 15) {
+ b1 = Math.abs(15 - o1.getBay1());
+ }
+ if (o2.getBay1() >= 15) {
+ b2 = Math.abs(15 - o2.getBay1());
+ }
+ return b2 - b1;
+ }
+ });
+
+ for (LocMast locMast1 : locMasts) {
+// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+// continue;
+// }
+ String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
+ if (Cools.isEmpty(locMast2)){
+ continue;
+ }
+ if (locMast2.getLocSts().equals("P")||locMast2.getLocSts().equals("Q")||locMast2.getLocSts().equals("R")||locMast2.getLocSts().equals("S")){
+ continue;
+ }
+ if (!Cools.isEmpty(locMast2)&&locMast2.getLocSts().equals("O")){
+ locMast = locMast2;
+ break;
+ }
+ if (!Cools.isEmpty(locMast2)&&(locMast2.getLocSts().equals("F")||locMast2.getLocSts().equals("D"))){
+ locMast = locMast1;
+ break;
+ }
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+// if (Cools.isEmpty(locMast2)) {
+// locMast = locMast1;
+// break;
+// }
+ }
+ }
+
+ if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
+ locMast = null;
+ }
+
+ // 閫掑綊鏌ヨ
+ if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+ // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
+ if (times < rowCount) {
+ times = times + 1;
+ return getLocNo(1, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times);
+ }
+// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+// if (locTypeDto.getLocType1() < 2) {
+// int i = locTypeDto.getLocType1() + 1;
+// locTypeDto.setLocType1((short)i);
+// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
+// }
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ String locNo = locMast.getLocNo();
+
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ // 杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setCrnNo(crnNo);
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locNo);
return startupDto;
}
}
--
Gitblit v1.9.1