From dc07f8dfebabfc695bfe5fc4d65083eb2a23d728 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 十一月 2023 08:22:47 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |  507 +++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 372 insertions(+), 135 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 1986fe9..b7887ae 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,25 +1,57 @@
 package com.zy.common.service;
 
+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.service.*;
+import com.zy.asrs.utils.Utils;
+import com.zy.asrs.utils.VersionUtils;
+import com.zy.common.model.LocTypeDto;
 import com.zy.common.model.StartupDto;
-import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.properties.SlaveProperties;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 璐ф灦鏍稿績鍔熻兘
  * Created by vincent on 2020/6/11
  */
+@Slf4j
 @Service
 public class CommonService {
+
+    public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+        add(1);
+    }};
+    public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+        add(3);add(4);
+    }};
+    public static final List<Integer> THIRD_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+        add(6);add(7);
+    }};
+    public static final List<Integer> FOURTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+        add(8);
+    }};
+    public static final List<Integer> FIFTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+        add(10);add(11);
+    }};
+    public static final List<Integer> SIXTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+        add(13);add(14);add(15);add(16);
+    }};
+    public static final List<Integer> SEVENTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+        add(13);add(14);
+    }};
+    public static final List<Integer> EIGHTH_GROUP_ROW_LIST = new ArrayList<Integer>() {{
+        add(16);
+    }};
+
 
     @Autowired
     private WrkMastService wrkMastService;
@@ -37,10 +69,14 @@
     private LocMastService locMastService;
     @Autowired
     private LocDetlService locDetlService;
+    @Autowired
+    private SlaveProperties slaveProperties;
+    @Autowired
+    private LocRuleService locRuleService;
 
     /**
      * 鐢熸垚宸ヤ綔鍙�
-     * @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷f枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
+     * @param wrkMk 0:鍏ュ嚭搴� ; 1:鍏朵粬
      * @return workNo(宸ヤ綔鍙�)
      */
     public int getWorkNo(Integer wrkMk) {
@@ -48,25 +84,14 @@
         if (Cools.isEmpty(wrkLastno)) {
             throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�");
         }
-
-        // 绫诲瀷
-        switch (wrkMk) {
-            case 0:     // 鍏ュ簱 1 - 3000
-                break;
-            case 1:     // 鎷f枡/骞舵澘/鐩樼偣 3001 - 6000
-                break;
-            case 2:     // 鍑哄簱 6001 -9000
-                break;
-            case 3:     // 鍏朵粬 9001 -9999
-                break;
-            default:
-                break;
-        }
-
-        int workNo = wrkLastno.getWrkNo();
+        int workNo = 0;
+        // 鍏ュ嚭搴撶被鍨�
+        workNo = wrkLastno.getWrkNo();
         int sNo = wrkLastno.getSNo();
         int eNo = wrkLastno.getENo();
+
         workNo = workNo>=eNo ? sNo : workNo+1;
+
         while (true) {
             WrkMast wrkMast = wrkMastService.selectById(workNo);
             if (null != wrkMast) {
@@ -75,12 +100,10 @@
                 break;
             }
         }
-        // 淇敼搴忓彿璁板綍
         if (workNo > 0){
             wrkLastno.setWrkNo(workNo);
             wrkLastnoService.updateById(wrkLastno);
         }
-        // 妫�楠�
         if (workNo == 0) {
             throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
         } else {
@@ -91,128 +114,342 @@
         return workNo;
     }
 
+    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
+        return getLocNo(staDescId, sourceStaNo, matNos, locTypeDto, times);
+    }
+
     /**
      * 妫�绱㈠簱浣嶅彿
-     * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
-     * @param staDescId 璺緞ID
+     *
+     * @param staDescId   璺緞ID
      * @param sourceStaNo 婧愮珯
-     * @param matNos 鐗╂枡鍙烽泦鍚�
+     * @param matNos      鐗╂枡鍙烽泦鍚�
      * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
      */
-    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
+    public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
+        // 鐩爣搴撲綅
+        LocMast locMast = null;
+
+        // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+        locMast = getLocNoStep4(staDescId, locTypeDto);
+        if (locMast != null) {
+            //鎵惧埌搴撲綅锛岃繑鍥瀌to
+            return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+        }
+
+        //搴撲綅瑙勫垯
+        locMast = getLocNoStepRule(matNos, locTypeDto);
+        if (locMast != null) {
+            //鎵惧埌搴撲綅锛岃繑鍥瀌to
+            return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+        }
+
+        //瀛樿揣鍒嗙被缂栫爜瑙勫垯
+        locMast = getLocNoCodeStepRule(matNos, locTypeDto);
+        if (locMast != null) {
+            //鎵惧埌搴撲綅锛岃繑鍥瀌to
+            return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+        }
+
+        // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+        locMast = getLocNoStep3(staDescId, matNos, locTypeDto);
+        if (locMast != null) {
+            //鎵惧埌搴撲綅锛岃繑鍥瀌to
+            return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+        }
+
+        //鎼滅储鍗曞搧
+        locMast = getLocNoStepSingle(matNos, locTypeDto);
+        if (locMast != null) {
+            //鎵惧埌搴撲綅锛岃繑鍥瀌to
+            return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+        }
+
+        //鎼滅储娣锋斁
+        locMast = getLocNoStepMixed(matNos, locTypeDto, times);
+        if (locMast != null) {
+            //鎵惧埌搴撲綅锛岃繑鍥瀌to
+            return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+        }
+        if(locTypeDto.getLocType1()==1){
+            locTypeDto.setLocType1((short)2);
+            return getLocNo(staDescId, 1, sourceStaNo, matNos, locTypeDto,0);
+        }else if(locTypeDto.getLocType1()==2){
+            locTypeDto.setLocType1((short)3);
+            return getLocNo(staDescId, 1, sourceStaNo, matNos, locTypeDto,0);
+        }
+        //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
+        throw new CoolException("娌℃湁绌哄簱浣�");
+    }
+
+    /**
+     * 搴撲綅瑙勫垯
+     */
+    private LocMast getLocNoStepRule(List<String> matNos, LocTypeDto locTypeDto) {
+        LocMast locMast = null;
+
+        //搴撲綅瑙勫垯鍙兘鍦ㄥ崟鍝佽揣鐗╀腑鐢熸晥
+        if (matNos.size() == 1) {
+            // 搴撳尯閿佸畾
+            List<LocRule> locRules = locRuleService.find(Cools.isEmpty(matNos) ? null : matNos.get(0));
+            if (locRules == null || locRules.isEmpty()) {
+                return null;//娌℃湁搴撲綅瑙勫垯锛岃烦鍑哄綋鍓嶄换鍔�
+            }
+
+            for (LocRule locRule : locRules) {
+                if (locRule == null) {
+                    continue;
+                }
+
+                List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
+                for (LocMast locMast0 : locMasts) {
+                    LocMast locMast1 = locMastService.findInnerLoc(locMast0.getLocNo());//妫�娴嬪悓搴撲綅缁勬繁搴撲綅鏄惁鏈夌┖闂插簱浣�
+                    if (locMast1 != null) {
+                        //棰勭暀绌哄簱浣�
+                        if (locMastService.checkEmptyCount(locMast1, 10)) {
+                            return locMast1;
+                        }
+                    }
+                }
+            }
+
+            if (locRules.get(0).getKeepGo() == 0) {
+                //鎵句笉鍒扮┖搴撲綅锛屼笖绂佹缁х画瀵绘壘鍏朵粬闈炴贩杞藉尯鍩熷簱浣�
+                //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
+                throw new CoolException("瑙勫垯鍖哄煙娌℃湁绌哄簱浣�");
+            }
+        }
+
+        return locMast;
+    }
+
+    /**
+     * 搴撲綅缂栫爜瑙勫垯
+     */
+    private LocMast getLocNoCodeStepRule(List<String> matNos, LocTypeDto locTypeDto) {
+        LocMast locMast = null;
+
+        //搴撲綅缂栫爜瑙勫垯鍙兘鍦ㄧ浉鍚岀紪鐮佽揣鐗╀腑鐢熸晥
+        String matnr = "";
+        for(String matNo : matNos){
+            if("".equals(matnr)){
+                matnr = matNo.substring(0, 4);
+            }
+            if(!matnr.equals(matNo.substring(0, 4))){
+                return null;
+            }
+        }
+
+        // 搴撳尯閿佸畾
+        List<LocRule> locRules = locRuleService.findCode(Cools.isEmpty(matNos) ? null : matNos.get(0),null);
+        if (locRules == null || locRules.isEmpty()) {
+            return null;//娌℃湁搴撲綅瑙勫垯锛岃烦鍑哄綋鍓嶄换鍔�
+        }
+
+        for (LocRule locRule : locRules) {
+            if (locRule == null) {
+                continue;
+            }
+
+            List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd());
+            for (LocMast locMast0 : locMasts) {
+                LocMast locMast1 = locMastService.findInnerLoc(locMast0.getLocNo());//妫�娴嬪悓搴撲綅缁勬繁搴撲綅鏄惁鏈夌┖闂插簱浣�
+                if (locMast1 != null) {
+                    //棰勭暀绌哄簱浣�
+                    if (locMastService.checkEmptyCount(locMast1, 10)) {
+                        return locMast1;
+                    }
+                }
+            }
+        }
+
+//            if (locRules.get(0).getKeepGo() == 0) {
+//                //鎵句笉鍒扮┖搴撲綅锛屼笖绂佹缁х画瀵绘壘鍏朵粬闈炴贩杞藉尯鍩熷簱浣�
+//                //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
+//                throw new CoolException("瑙勫垯鍖哄煙娌℃湁绌哄簱浣�");
+//            }
+
+        return locMast;
+    }
+
+    // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+    private LocMast getLocNoStep3(Integer staDescId, List<String> matNos, LocTypeDto locTypeDto) {
+        LocMast locMast = null;
+        if (!Cools.isEmpty(matNos) && matNos.size() == 1 && staDescId == 1) {
+            //鍏堝垽鏂伐浣滄。锛屾煡鎵句富妗OType=1锛� wrkSts < 10鐨勫伐浣滄槑缁嗭紝鏂欏彿鐩稿悓鐨勬槑缁嗗簱浣�
+            List<WrkMast> wrkMasts = wrkMastService.selectSameMatnrs(matNos.get(0));
+            for (WrkMast wrkMast : wrkMasts) {
+                LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
+                if (null != locMast0) {
+                    // 娴呭簱浣嶇鍚堝昂瀵告娴�
+                    if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+                        locMast = locMast0;
+                    }
+                }
+            }
+            if (Cools.isEmpty(locMast)) {
+                //鍐嶅垽鏂簱瀛樻槑缁嗘。锛屾枡鍙风浉鍚岀殑鏄庣粏搴撲綅
+                List<String> locNos = locDetlService.getSameDetl(matNos.get(0));
+                for (String locNo : locNos) {
+                    LocMast locMast0 = locMastService.findInnerLoc(locNo);
+                    if (null != locMast0) {
+                        // 娴呭簱浣嶇鍚堝昂瀵告娴�
+                        if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+                            locMast = locMast0;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        return locMast;
+    }
+
+    // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+    private LocMast getLocNoStep4(Integer staDescId, LocTypeDto locTypeDto) {
+        LocMast locMast = null;
+        // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+        if (staDescId == 10) {
+            //鍏堝垽鏂伐浣滄。锛屾煡鎵句富妗OType=1锛� wrkSts < 10鐨勫伐浣滄槑缁嗭紝鏂欏彿鐩稿悓鐨勬槑缁嗗簱浣�
+            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type",10));
+            for (WrkMast wrkMast : wrkMasts) {
+                LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
+                if (null != locMast0) {
+                    // 娴呭簱浣嶇鍚堝昂瀵告娴�
+                    if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+                        locMast = locMast0;
+                        break;
+                    }
+                }
+            }
+            if (Cools.isEmpty(locMast)){
+                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                        .eq("loc_sts", "O"));
+                if (locMasts.size() > 0) {
+                    for (LocMast loc : locMasts) {
+                        LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
+                        if (null != locMast0) {
+                            // 娴呭簱浣嶇鍚堝昂瀵告娴�
+                            if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+                                locMast = locMast0;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return locMast;
+    }
+
+    // 鎼滅储娣锋斁
+    private LocMast getLocNoStepMixed(List<String> matNos, LocTypeDto locTypeDto, int times) {
+        LocMast locMast = null;
+
+        if (matNos.size() > 1) {
+            List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(), 1);//鎼滅储娣锋斁搴撲綅
+            //娣锋斁鍖哄煙鐩存帴鍙栫涓�涓嵆鍙�
+            for (LocMast mast : locMasts) {
+                //棰勭暀绌哄簱浣�
+                if (locMastService.checkEmptyCount(mast, 10)) {
+                    locMast = mast;
+                    break;
+                }
+            }
+        }
+
+        // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+        if (Cools.isEmpty(locMast)) {
+            log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+        }
+
+        return locMast;
+    }
+
+    // 鎼滅储鍗曞搧
+    private LocMast getLocNoStepSingle(List<String> matNos, LocTypeDto locTypeDto) {
+        LocMast locMast = null;
+        // 1.鍏堟悳绱㈠崟鍝�
+        if (matNos.size() == 1) {
+            //鍗曞搧
+            List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(), 2);//鎼滅储鍗曞搧搴撲綅
+
+            for (LocMast mast : locMasts) {
+                List<String> groupLoc = Utils.getGroupLoc(mast.getLocNo());
+                if (!locMastService.checkAllLocEmpty(groupLoc)) {
+                    continue;
+                }
+
+                LocMast tmp = null;
+                for (String loc : groupLoc) {
+                    LocMast locMast1 = locMastService.selectByLoc(loc);
+                    if (locMast1 == null) {
+                        continue;
+                    }
+
+                    if (!locMast1.getLocSts().equals("O")) {
+                        continue;
+                    }
+
+                    tmp = locMast1;
+                    break;
+                }
+
+                //棰勭暀绌哄簱浣�
+                if (tmp != null && locMastService.checkEmptyCount(mast, 10)) {
+                    locMast = tmp;
+                    break;
+                }
+            }
+
+            if (locMast == null) {
+                //鍗曞搧鎵句笉鍒板簱浣嶏紝鍏佽灏濊瘯浠庢贩鏀惧尯鍩熶腑杩涜鎼滅储
+                List<LocMast> locMasts2 = locMastService.selectAreaEmpty(locTypeDto.getLocType1(), 1);//鎼滅储鍗曞搧搴撲綅
+                //娣锋斁鍖哄煙鐩存帴鍙栫涓�涓嵆鍙�
+                for (LocMast mast : locMasts2) {
+                    //棰勭暀绌哄簱浣�
+                    if (locMastService.checkEmptyCount(mast, 10)) {
+                        locMast = mast;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return locMast;
+    }
+
+    //杩斿洖dto
+    private StartupDto getLocNoStep6(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
         StartupDto startupDto = new StartupDto();
+        String locNo = locMast.getLocNo();
+        // 鑾峰彇鐩爣绔�
+        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+                .eq("type_no", staDescId)
+                .eq("stn_no", sourceStaNo)
+                .eq("crn_no",Utils.stnNoToLiftNo(sourceStaNo));//鍊熺敤鍫嗗灈鏈哄彿瀛楁鍏呭綋鎻愬崌鏈哄彿
+        StaDesc staDesc = staDescService.selectOne(wrapper);
+        if (Cools.isEmpty(staDesc)) {
+            log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
+            throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+        }
+
+        // 妫�娴嬬洰鏍囩珯
+        BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+        if (!staNo.getAutoing().equals("Y")) {
+            throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+        }
+
         // 鐢熸垚宸ヤ綔鍙�
-        int workNo = getWorkNo(WorkNoType.getWorkNoType(staDescId));
+        int workNo = getWorkNo(0);
+        // 杩斿洖dto
         startupDto.setWorkNo(workNo);
-        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();
-            int crn_qty = rowLastno.getCrnQty();
-            int rowCount = eRow - sRow + 1;
-            // 鐩爣鍫嗗灈鏈哄彿
-            int crnNo = 0;
-            // 鐩爣搴撲綅
-            LocMast locMast = null;
-
-            // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
-            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;
-//                    }
-//                }
-            }
-
-            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) {
-                // 鏌ユ壘搴撲綅
-                if (locMast == null) {
-                    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()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤");
-        }
+        startupDto.setSourceStaNo(sourceStaNo);
+        startupDto.setStaNo(staNo.getDevNo());
+        startupDto.setLocNo(locMast.getLocNo());
         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;
-        } else if (msg.length() > count) {
-            return msg.substring(0, 16);
-        } else {
-            StringBuilder msgBuilder = new StringBuilder(msg);
-            for(int i = 0; i < count - msg.length(); ++i) {
-                msgBuilder.insert(0, "0");
-            }
-            return msgBuilder.toString();
-        }
-    }
-
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1