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/PlaServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index 6cbd4cd..6aa415c 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -30,7 +30,7 @@
private PlaQtyService plaQtyService;
public Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand) {
- return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo).eq("brand",brand));
+ return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo).eq("brand",brand).eq(false,"status","鍏ㄩ儴鍑哄簱"));
}
@Override
@@ -93,13 +93,15 @@
}
//閫�鍥�
+ @Transactional
public void returned(List<PlaQty> plaQties, User user) {
plaQties.forEach(plaQty -> {
PlaQty plaQtyOut = plaQtyService.selectById(plaQty.getId());
- if(Cools.isEmpty(plaQtyOut.getReturned())){
+ if(Cools.isEmpty(plaQtyOut.getReturned()) || plaQtyOut.getReturned() == 0){
plaQtyOut.setReturned(plaQty.getOrderWeight());
}else {
- plaQtyOut.setReturned(plaQty.getOrderWeight()+plaQtyOut.getReturned());
+ throw new CoolException("璇ュ寘鐗╂枡宸查��鍥�");
+ //plaQtyOut.setReturned(plaQty.getOrderWeight()+plaQtyOut.getReturned());
}
plaQtyService.updateById(plaQtyOut);
@@ -110,6 +112,7 @@
plaQtyReturned.setLocNo(plaQtyOut.getLocNo());
plaQtyReturned.setOrderNo(plaQtyOut.getOrderNo());
plaQtyReturned.setPakoutTime(Utils.getDateStr(new Date()));
+ plaQtyReturned.setBrand(plaQty.getBrand());
plaQtyReturned.setOrderWeight(plaQty.getOrderWeight());
plaQtyReturned.setTransfer("閫�鍥炲叆搴�");
plaQtyReturned.setHandlerBy(user.getUsername());
@@ -127,7 +130,7 @@
this.updateById(pla);
SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
- null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
});
}
--
Gitblit v1.9.1