From 9ea93abc2606948e5724316a4a3ec338ea14a130 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 17 十一月 2025 13:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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..401a7c2 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.DropdownValuesDto;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Pla;
import com.zy.asrs.entity.PlaQty;
@@ -21,6 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@@ -28,6 +30,14 @@
public class PlaServiceImpl extends ServiceImpl<PlaMapper, Pla> implements PlaService {
@Autowired
private PlaQtyService plaQtyService;
+
+ @Resource
+ private PlaMapper plaMapper;
+
+ @Override
+ public List<DropdownValuesDto> getDropdownValues() {
+ return plaMapper.getDropdownValues();
+ }
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));
@@ -93,13 +103,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 +122,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());
@@ -122,12 +135,19 @@
//pla.setStatus(GlobleParameter.PLA_STATUS_0);
pla.setModifyTime(new Date());
+ // 閫�璐т汉 modify_user锛岄��璐у娉� create_user锛岄��璐ф爣璇� transfer
+ pla.setModifyUser(user.getUsername());
+ pla.setCreateUser(plaQty.getMemo());
+ pla.setTransfer("閫�璐�");
+ pla.setStash(""); // 搴撳尯
+ pla.setLocNo(""); // 搴撲綅
+
pla.setWeightAnfme(pla.getWeightAnfme() + plaQty.getOrderWeight());
pla.setStatus(GlobleParameter.PLA_STATUS_1);
this.updateById(pla);
- SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
- null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ SaasUtils.insertLog(4,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
});
}
@@ -160,13 +180,17 @@
Object create_time = page.getCondition().get("create_time");
Object brand = page.getCondition().get("brand");
Object status = page.getCondition().get("status");
+ String type = (String) page.getCondition().get("type");
+ String workshop = (String) page.getCondition().get("workshop");
+ String transfer = (String) page.getCondition().get("transfer");
+
String createTime = create_time == null ? null : create_time.toString();
if(!Cools.isEmpty(createTime)){
String[] dates = createTime.split(" - ");
stime = DateUtils.convert(dates[0]);
etime = DateUtils.convert(dates[1]);
}
- plaList=baseMapper.getStockStatisAll(brand == null ? null:brand.toString(), status == null ? null:status.toString(), stime,etime);
+ plaList=baseMapper.getStockStatisAll(brand == null ? null:brand.toString(), status == null ? null:status.toString(), stime,etime, type, workshop, transfer);
double weightSum = plaList.stream().mapToDouble(Pla::getWeight).sum();
--
Gitblit v1.9.1