From 25314b5ee613c48e7db31138d7fcb8abc4c536be Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 14 一月 2024 20:15:05 +0800
Subject: [PATCH] # 功能完善
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 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 5843839..80f23d4 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -7,9 +7,11 @@
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Pla;
import com.zy.asrs.entity.PlaQty;
+import com.zy.asrs.entity.param.GlobleParameter;
import com.zy.asrs.mapper.PlaMapper;
import com.zy.asrs.service.PlaQtyService;
import com.zy.asrs.service.PlaService;
+import com.zy.asrs.utils.SaasUtils;
import com.zy.asrs.utils.Utils;
import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +42,7 @@
if(!Cools.isEmpty(orderDetl.getBrand())){
wrapper.eq("package_no",orderDetl.getBrand());
}
- wrapper.eq("status","宸插叆搴�");
+ wrapper.eq("status", GlobleParameter.PLA_STATUS_1);
wrapper.ge("finger_melting", orderDetl.getFingerMeltingMin()).le("finger_melting", orderDetl.getFingerMeltingMax());
wrapper.ge("fusing_point", orderDetl.getFusingPointMin()).le("fusing_point", orderDetl.getFusingPointMax());
wrapper.ge("yellowness", orderDetl.getYellownessMin()).le("yellowness", orderDetl.getYellownessMax());
@@ -91,7 +93,11 @@
public void returned(List<PlaQty> plaQties, User user) {
plaQties.forEach(plaQty -> {
PlaQty plaQtyOut = plaQtyService.selectById(plaQty.getId());
- plaQtyOut.setReturned(1);
+ if(Cools.isEmpty(plaQtyOut.getReturned())){
+ plaQtyOut.setReturned(plaQty.getOrderWeight());
+ }else {
+ plaQtyOut.setReturned(plaQty.getOrderWeight()+plaQtyOut.getReturned());
+ }
plaQtyService.updateById(plaQtyOut);
PlaQty plaQtyReturned = new PlaQty();
@@ -101,17 +107,23 @@
plaQtyReturned.setLocNo(plaQtyOut.getLocNo());
plaQtyReturned.setOrderNo(plaQtyOut.getOrderNo());
plaQtyReturned.setPakoutTime(Utils.getDateStr(new Date()));
- plaQtyReturned.setOrderWeight(0 - plaQtyOut.getOrderWeight());
+ plaQtyReturned.setOrderWeight(plaQty.getOrderWeight());
+ plaQtyReturned.setTransfer("閫�鍥炲叆搴�");
plaQtyReturned.setHandlerBy(user.getUsername());
plaQtyReturned.setCustomer(plaQtyOut.getCustomer());
plaQtyReturned.setMemo(plaQty.getMemo());
plaQtyService.insert(plaQtyReturned);
+ //鐩存帴鏇存柊pla鐨勫簱瀛�
Pla pla = this.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo());
- pla.setStatus("寰呭叆搴�");
+ //pla.setStatus(GlobleParameter.PLA_STATUS_0);
+ pla.setWeightAnfme(plaQty.getOrderWeight());
+ pla.setStatus(GlobleParameter.PLA_STATUS_1);
this.updateById(pla);
+ SaasUtils.insertLog(0,pla.getLocNo(),pla.getBatch()+","+pla.getPackageNo(),plaQty.getOrderWeight(),user.getUsername());
+
});
}
}
--
Gitblit v1.9.1