From 4df80cad47f22a930435835e7f7135bd60672cd8 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期四, 26 九月 2024 15:38:43 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |  324 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 297 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 039df1b..3ad8124 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1,35 +1,36 @@
 package com.zy.asrs.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.*;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
 import com.core.exception.CoolException;
-import com.sun.org.apache.xpath.internal.operations.Or;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.*;
 import com.zy.asrs.mapper.ManLocDetlMapper;
 import com.zy.asrs.service.*;
-import com.zy.asrs.utils.MatUtils;
 import com.zy.asrs.utils.SaasUtils;
-import com.zy.common.CodeRes;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.entity.Parameter;
+import com.zy.asrs.utils.Utils;
 import com.zy.common.model.DetlDto;
-import com.zy.common.model.MesCombParam;
 import com.zy.common.service.CommonService;
-import com.zy.common.utils.HttpHandler;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
+import com.zy.system.service.SaasLogService;
+import lombok.Synchronized;
 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.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * 绉诲姩绔湇鍔℃牳蹇冪被
@@ -91,6 +92,19 @@
 
     @Autowired
     private LocInPrintMatService locInPrintMatService;
+
+    @Autowired
+    private LocOutPrintMatService locOutPrintMatService;
+
+    @Autowired
+    private LocOwnerService locOwnerService;
+    @Autowired
+    private PlaService plaService;
+    @Autowired
+    private PlaQtyService plaQtyService;
+    @Autowired
+    private SaasLogService saasLogService;
+
 
 
 
@@ -651,7 +665,8 @@
             }
             orderService.checkComplete(order.getOrderNo());
 
-            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
+            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
+        null,null,null,null,null,null);
         }
 
 
@@ -792,7 +807,8 @@
                     return R.error("鏇存柊骞冲簱搴撳瓨鐘舵�佸け璐�");
                 }
             }
-            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
+            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
+                    null,null,null,null,null,null);
 
         }
         return R.ok("涓嬫灦瀹屾垚");
@@ -962,8 +978,21 @@
     public R manDetlOrigin(JSONObject json, User user) {
         Date now = new Date();
         String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+        String ownerName = (String) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
+        LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", ownerName));
+        Long ownerId = locOwner.getId();
         String jsonCode = (String) json.get("code"); //鑾峰彇鏉$爜
         String jsonOrigin = (String) json.get("origin"); //鑾峰彇鏉ユ簮鍦�
+        if (Cools.isEmpty(jsonLocNo)){
+            return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
+        }else if (Cools.isEmpty(ownerId)){
+            return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+        }else if (Cools.isEmpty(jsonCode)){
+            return R.error("鏉$爜鍙傛暟涓虹┖锛�");
+        }else if (Cools.isEmpty(jsonOrigin)){
+            return R.error("鏉ユ簮鍦板弬鏁颁负绌猴紒");
+        }
+        Integer jsonOwner = ownerId.intValue(); //鑾峰彇鎷ユ湁鑰�
         OriginRule originRule = originRuleService.selectOne(new EntityWrapper<OriginRule>()
                 .eq("origin_address", jsonOrigin));
 
@@ -998,9 +1027,11 @@
             }
             //澧炲姞鎵撳嵃妗f
             LocInPrintMat locInPrintMat = new LocInPrintMat(now,user.getId(), mat.getMatnr(),jsonOriginDetl.getBatch(),jsonOriginDetl.getAnfme(),jsonLocNo,mat.getMaktx());
+            locInPrintMat.setOwnerId(ownerId);
             locInPrintMatService.insert(locInPrintMat);
 
-            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",date);
+            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo)
+                    .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",date).eq("owner",jsonOwner);
             ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
             if(!Cools.isEmpty(manLocDetl1)){
                 BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
@@ -1031,6 +1062,13 @@
                 manLocDetl.setModiTime(now);
                 // manLocDetl.setOrderNo(waitPakin.getOrderNo());
                 manLocDetl.setStockFreeze(1);
+                manLocDetl.setOwner(jsonOwner);
+                try {
+                    Date produceTime = DateUtils.convert(manLocDetl.getBatch(),DateUtils.yyyyMMdd);
+                    manLocDetl.setProduceTime(produceTime);
+                } catch (Exception e) {
+                    manLocDetl.setProduceTime(now);
+                }
 
                 if (!manLocDetlService.insert(manLocDetl)){  //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
                     return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
@@ -1045,7 +1083,15 @@
     public R manDetlOrigInNo(JSONObject json, User user) {
         Date now = new Date();
         String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
-
+        String ownerName = (String) json.get("owner"); //鑾峰彇鎷ユ湁鑰�
+        LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", ownerName));
+        Long ownerId = locOwner.getId();
+        if (Cools.isEmpty(jsonLocNo)){
+            return R.error("搴撲綅鍙峰弬鏁颁负绌猴紒");
+        }else if (Cools.isEmpty(ownerId)){
+            return R.error("鎷ユ湁鑰呭弬鏁颁负绌猴紒");
+        }
+        Integer jsonOwner = ownerId.intValue(); //鑾峰彇鎷ユ湁鑰�
         Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo));  //鑾峰彇瀵瑰簲搴撲綅淇℃伅
         if (Cools.isEmpty(node)){
             return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
@@ -1061,9 +1107,11 @@
             }
             //澧炲姞鎵撳嵃妗f
             LocInPrintMat locInPrintMat = new LocInPrintMat(now,user.getId(), mat.getMatnr(),jsonOriginDetl.getBatch(),jsonOriginDetl.getAnfme(),jsonLocNo,mat.getMaktx());
+            locInPrintMat.setOwnerId(ownerId);
             locInPrintMatService.insert(locInPrintMat);
 
-            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",jsonOriginDetl.getBatch());
+            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo)
+                    .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch",jsonOriginDetl.getBatch()).eq("owner",jsonOwner);
             ManLocDetl manLocDetl1 = manLocDetlService.selectOne(manLocDetlWrapper);
             if(!Cools.isEmpty(manLocDetl1)){
                 BigDecimal inAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
@@ -1092,9 +1140,15 @@
                 manLocDetl.setCreateTime(now);
                 manLocDetl.setUpdateBy(user.getId());
                 manLocDetl.setModiTime(now);
+                manLocDetl.setOwner(jsonOwner);
                 // manLocDetl.setOrderNo(waitPakin.getOrderNo());
                 manLocDetl.setStockFreeze(1);
-
+                try {
+                    Date produceTime = DateUtils.convert(jsonOriginDetl.getBatch(),DateUtils.yyyyMMdd);
+                    manLocDetl.setProduceTime(produceTime);
+                } catch (Exception e) {
+                    manLocDetl.setProduceTime(now);
+                }
                 if (!manLocDetlService.insert(manLocDetl)){  //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
                     return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
                 }
@@ -1106,24 +1160,35 @@
 
     @Override
     public R manDetlOriginOut(JSONObject json, User user) {
-        String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
-
+        Date now = new Date();
         JSONArray combMats = json.getJSONArray("combMats");
+        List<MatPrint> matPrintList=new ArrayList<>();
+        List<Long> ids=new ArrayList<>();
         for (int i = 0; i < combMats.size(); i++) {
-            OrderDetl jsonOriginDetl = combMats.getObject(i, OrderDetl.class);
-            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo).eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch());
+            MatPrint matPrintNow = combMats.getObject(i, MatPrint.class);
+            if (!ids.contains(matPrintNow.getIndex())){
+                ids.add(matPrintNow.getIndex());
+                matPrintList.add(matPrintNow);
+            }
+        }
+        for (MatPrint jsonOriginDetl:matPrintList) {
+            Double parseLong = jsonOriginDetl.getAnfme();
+            Long ownerId = Long.parseLong(jsonOriginDetl.getOwner());
+            jsonOriginDetl.setOwnerId(ownerId);
+            Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", jsonOriginDetl.getLocNo())
+                    .eq("matnr", jsonOriginDetl.getMatnr()).eq("batch", jsonOriginDetl.getBatch()).eq("owner",jsonOriginDetl.getOwnerId());
             ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
             if (Cools.isEmpty(manLocDetl)){
-                return R.error("鏈晢鍝佹槑缁嗕俊鎭�!搴撲綅鍙凤細"+jsonLocNo+";鍟嗗搧缂栧彿锛�"+jsonOriginDetl.getMatnr()+"鎵规锛�"+jsonOriginDetl.getBatch());
+                return R.error("鏈煡璇㈠埌鍟嗗搧鏄庣粏淇℃伅!搴撲綅鍙凤細"+jsonOriginDetl.getLocNo()+";鍟嗗搧缂栧彿锛�"+jsonOriginDetl.getMatnr()+"鎵规锛�"+jsonOriginDetl.getBatch()+"璐т富"+jsonOriginDetl.getOwnerId());
             }
-            BigDecimal outAnfme = BigDecimal.valueOf(jsonOriginDetl.getAnfme());
+            BigDecimal outAnfme = BigDecimal.valueOf(parseLong);
             BigDecimal anfme = BigDecimal.valueOf(manLocDetl.getAnfme());
 
-            if (manLocDetl.getAnfme() > jsonOriginDetl.getAnfme()){
+            if (manLocDetl.getAnfme() > parseLong){
                 BigDecimal num = anfme.subtract(outAnfme);
                 manLocDetl.setAnfme(num.doubleValue());
-
-
+                manLocDetl.setUpdateBy(user.getId());
+                manLocDetl.setModiTime(now);
                 if (!manLocDetlService.update(manLocDetl,manLocDetlWrapper)) {
                     return R.error("鐗╂枡淇℃伅涓嬫灦澶辫触");
                 }
@@ -1133,9 +1198,214 @@
                     return R.error("鐗╂枡淇℃伅鍒犻櫎澶辫触");
                 }
             }
-
-
+        }
+        for (MatPrint jsonOriginDetl:matPrintList) {
+            //澧炲姞鎵撳嵃妗f
+            LocOutPrintMat locOutPrintMat = new LocOutPrintMat(now, user.getId(), jsonOriginDetl.getMatnr(), jsonOriginDetl.getBatch(), jsonOriginDetl.getAnfme(), jsonOriginDetl.getLocNo(), jsonOriginDetl.getMaktx());
+            locOutPrintMat.setOwnerId(jsonOriginDetl.getOwnerId());
+            locOutPrintMatService.insert(locOutPrintMat);
         }
         return R.ok();
     }
+
+    @Override
+    public void plaPakin(String brand, String locNo, String batch, Integer packageNo, User user) {
+        Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
+        if(Cools.isEmpty(pla)){
+            throw new CoolException("绯荤粺鏈娴嬪埌璇ュ寘鐗╂枡淇℃伅锛岃閲嶆柊褰曞叆");
+        }
+
+        if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_00)){
+            throw new CoolException("璇ョ墿鏂欑姸鎬佷笉涓哄緟鍏ュ簱锛屾棤娉曞叆搴�");
+        }
+
+        pla.setStatus(GlobleParameter.PLA_STATUS_1);
+        pla.setModifyTime(new Date());
+        pla.setPakinTime(new Date());
+
+        Node node = nodeService.selectByUuid(locNo);
+        if(Cools.isEmpty(node)){
+            throw new CoolException("搴撲綅淇℃伅涓嶆纭�");
+        }
+
+        pla.setStash(node.getParentName());
+        pla.setLocNo(node.getUuid());
+
+        plaService.updateById(pla);
+        SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
+                null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
+    }
+
+    @Override
+    @Transactional
+    @Synchronized
+    public void plaPakout(String brand, String locNo, String batch, Integer packageNo, String orderNo, String plaQtyId, String wrkNo, Double anfme, boolean isReplace) {
+        Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
+
+        ManPakOut manPakOut = manPakOutService.selectById(wrkNo);
+
+        PlaQty plaQty = plaQtyService.selectById(plaQtyId);
+
+        //鐗╂枡鏇挎崲
+        if(isReplace){
+            replacePla(pla,manPakOut,plaQty);
+        }else {
+            if((!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_2) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_3) && !Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1)) ||
+                    !Cools.eq(pla.getBatch(),manPakOut.getBatch()) ||
+                    !Cools.eq(pla.getPackageNo()+"",manPakOut.getBarcode()) ||
+                    !Cools.eq(pla.getBrand(),manPakOut.getMaktx()) ){
+                throw new CoolException("鐗╂枡涓嶄竴鑷达紝鏃犳硶鍑哄簱" + "鎵瑰彿锛�" + pla.getBatch() + "锛屽寘鍙凤細" + pla.getPackageNo() + "锛岀墝鍙凤細" + pla.getBrand());
+            }
+        }
+
+        //鏇存柊鎷h揣鍗曚俊鎭�
+        if(manPakOut.getCount() + anfme > manPakOut.getAnfme()){
+            throw new CoolException("鎷h揣閲嶉噺澶т簬鎷h揣鍗曟墍闇�鎷h揣閲嶉噺锛岃閲嶆柊鍒嗛厤鎷h揣閲嶉噺");
+        }
+        if(manPakOut.getStatus() == 1){
+            throw new CoolException("璇ユ嫞鏂欏崟宸插嚭搴�");
+        }
+        manPakOut.setCount(manPakOut.getCount() + anfme);
+        if (manPakOut.getAnfme().equals(manPakOut.getCount())){
+            manPakOut.setStatus(1);
+            manPakOut.setUpdateTime(new Date());
+            manPakOutService.updateById(manPakOut);
+        }
+
+        //鏇存柊plaQty淇℃伅
+        plaQty.setPakoutTime(Utils.getDateStr(new Date()));
+        plaQtyService.updateById(plaQty);
+
+        //鏇存柊pla鏄庣粏
+        pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
+        pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
+        pla.setModifyTime(new Date());
+        if(pla.getWeightAnfme() <= 0){
+            pla.setStatus(GlobleParameter.PLA_STATUS_4);
+        }else {
+            pla.setStatus(GlobleParameter.PLA_STATUS_3);
+        }
+        plaService.updateById(pla);
+        SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
+                pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
+
+        //鏇存柊璁㈠崟鏄庣粏
+        Order order = orderService.selectByNo(orderNo);
+        OrderDetl orderDetl = orderDetlService.selectById(plaQty.getOrderDetlId());
+
+        orderDetl.setQty(orderDetl.getQty() + anfme);
+        orderDetlService.updateById(orderDetl);
+
+        orderService.checkComplete(orderNo);
+
+    }
+
+    @Override
+    public void plaPackOutWithoutOrder(String brand, String batch, Integer packageNo, Double anfme) {
+        Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
+        if(Cools.isEmpty(pla)){
+            throw new CoolException("褰撳墠鐗╂枡鏄庣粏涓嶅瓨鍦�");
+        }
+        if (!pla.getStatus().equals(GlobleParameter.PLA_STATUS_1) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_3)){
+            throw new CoolException("褰撳墠鐗╂枡鐘舵�佹棤娉曞嚭搴�");
+        }
+        if(anfme > pla.getWeightAnfme()){
+            throw new CoolException("褰撳墠鐗╂枡鍓╀綑搴撳瓨涓嶈冻");
+        }
+
+
+        pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
+        if(pla.getWeightAnfme() > 0){
+            pla.setStatus(GlobleParameter.PLA_STATUS_3);
+        }else {
+            pla.setStatus(GlobleParameter.PLA_STATUS_4);
+        }
+
+        plaService.updateById(pla);
+
+        SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
+
+    }
+
+    @Override
+    public List<ManPakOut> getManPakoutByOrderNo(String orderNo) {
+        return manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num",orderNo).eq("status",0));
+    }
+
+    public void replacePla(Pla plaNew, ManPakOut manPakOut, PlaQty plaQty){
+        //杩樺師鏃х墿鏂欑姸鎬�
+        Pla plaOld = plaService.selectByBatchAndPackageNo(manPakOut.getBatch(), Integer.parseInt(manPakOut.getBarcode()), manPakOut.getMaktx());
+
+        //鏇存柊鏂扮墿鏂欎俊鎭�
+        plaNew.setQtyAnfme(plaOld.getQtyAnfme());
+        plaNew.setStatus(plaOld.getStatus());
+        plaService.updateById(plaNew);
+
+        plaOld.setStatus(GlobleParameter.PLA_STATUS_1);
+        plaOld.setQtyAnfme(plaOld.getQtyAnfme() - manPakOut.getCount());
+
+        plaService.updateById(plaOld);
+
+        //鏇存柊plaQty淇℃伅
+        plaQty.setBatch(plaNew.getBatch());
+        plaQty.setBrand(plaNew.getBrand());
+        plaQty.setPackageNo(plaNew.getPackageNo());
+
+        plaQtyService.updateById(plaQty);
+
+        //鏇存柊鎷h揣鍗曚俊鎭�
+        manPakOut.setMaktx(plaNew.getBrand());
+        manPakOut.setBatch(plaNew.getBatch());
+        manPakOut.setBarcode(plaNew.getPackageNo() + "");
+        manPakOut.setUpdateTime(new Date());
+
+        manPakOutService.updateById(manPakOut);
+
+    }
+
+    @Override
+    public List<Pla> pdaSelectInfmt(String barcode) {
+        EntityWrapper<Pla> plaEntityWrapper = new EntityWrapper<>();
+        String[] split = barcode.split(";");
+        if (split.length == 4){
+            plaEntityWrapper.eq("brand",split[0]);
+            plaEntityWrapper.eq("batch",split[1]);
+            plaEntityWrapper.eq("package_no",split[2]);
+            plaEntityWrapper.eq("line",split[3]);
+        }else if (split.length == 1){
+            Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", barcode));
+            if (Cools.isEmpty(node)){
+                throw new CoolException("璇锋鏌ヨ緭鍏ョ殑搴撲綅鐮�");
+            }
+            plaEntityWrapper.eq("loc_no",barcode);
+            plaEntityWrapper.notLike("status","鍏ㄩ儴鍑哄簱");
+        }else {
+            throw new CoolException("鏉$爜淇℃伅鏈夎!");
+        }
+        List<Pla> plaList = plaService.selectList(plaEntityWrapper);
+        if (Cools.isEmpty(plaList)){
+            throw new CoolException("鏈煡璇㈠埌搴撳瓨鐗╂枡淇℃伅");
+        }
+        return plaList;
+    }
+
+    public boolean checkMaximum(String locNo, int packageNum){
+
+        Node node = nodeService.selectByUuid(locNo);
+        Node nodeParent = nodeService.selectById(node.getParentId());
+
+        if(Cools.isEmpty(nodeParent.getMajor())){
+            return true;
+        }
+
+        //褰撳墠搴撳瓨鍖呮暟
+        int count = plaService.selectCount(new EntityWrapper<Pla>().eq("loc_no", locNo)
+                .notIn("status", "鍏ㄩ儴鍑哄簱"));
+
+        if(nodeParent.getMajor() < count + packageNum){
+            return false;
+        }
+
+        return true;
+    }
 }

--
Gitblit v1.9.1