From 3babe039d11eeadeace6e4a8c8505b4270592b69 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 07 二月 2025 08:32:43 +0800
Subject: [PATCH] 登录页去除字体加载
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 136 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 129 insertions(+), 7 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 a86628f..4a1bd0e 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;
@@ -103,6 +104,7 @@
private PlaQtyService plaQtyService;
@Autowired
private SaasLogService saasLogService;
+
@@ -664,7 +666,7 @@
orderService.checkComplete(order.getOrderNo());
SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
- null,null,null,null,null);
+ null,null,null,null,null,null);
}
@@ -806,7 +808,7 @@
}
}
SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
- null,null,null,null,null);
+ null,null,null,null,null,null);
}
return R.ok("涓嬫灦瀹屾垚");
@@ -1231,17 +1233,30 @@
plaService.updateById(pla);
SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
- null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
}
@Override
@Transactional
- public void plaPakout(String brand, String locNo, String batch, Integer packageNo, String orderNo, String orderDetlId, String wrkNo, Double anfme) {
+ @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(orderDetlId);
+ 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());
+ }
+ }
//鏇存柊鎷ｈ揣鍗曚俊鎭�
if(manPakOut.getCount() + anfme > manPakOut.getAnfme()){
@@ -1253,6 +1268,7 @@
manPakOut.setCount(manPakOut.getCount() + anfme);
if (manPakOut.getAnfme().equals(manPakOut.getCount())){
manPakOut.setStatus(1);
+ manPakOut.setUpdateTime(new Date());
manPakOutService.updateById(manPakOut);
}
@@ -1271,12 +1287,14 @@
}
plaService.updateById(pla);
SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
- pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
//鏇存柊璁㈠崟鏄庣粏
Order order = orderService.selectByNo(orderNo);
OrderDetl orderDetl = orderDetlService.selectById(plaQty.getOrderDetlId());
-
+ if (orderDetl == null){
+ throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦ㄦ垨鑰呬笉鍖归厤");
+ }
orderDetl.setQty(orderDetl.getQty() + anfme);
orderDetlService.updateById(orderDetl);
@@ -1285,7 +1303,111 @@
}
@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);
+
+ //鏇存柊鎷ｈ揣鍗曚俊鎭�
+ 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