From ae7bca6082139d8f524a5aedd08e940de83356f4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 05 六月 2024 10:29:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 1a1a1d4..a0218de 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -20,6 +20,7 @@
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;
@@ -1237,6 +1238,7 @@
@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);
@@ -1266,6 +1268,7 @@
manPakOut.setCount(manPakOut.getCount() + anfme);
if (manPakOut.getAnfme().equals(manPakOut.getCount())){
manPakOut.setStatus(1);
+ manPakOut.setUpdateTime(new Date());
manPakOutService.updateById(manPakOut);
}
@@ -1354,6 +1357,7 @@
manPakOut.setMaktx(plaNew.getBrand());
manPakOut.setBatch(plaNew.getBatch());
manPakOut.setBarcode(plaNew.getPackageNo() + "");
+ manPakOut.setUpdateTime(new Date());
manPakOutService.updateById(manPakOut);
@@ -1374,16 +1378,34 @@
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