From 5c33c1b05565112c72146c60961dd8cbc19af570 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 24 七月 2024 10:28:17 +0800
Subject: [PATCH] 不良品推送修改
---
src/main/java/com/whyc/service/DefectiveProductsService.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/DefectiveProductsService.java b/src/main/java/com/whyc/service/DefectiveProductsService.java
index b50a675..b69859c 100644
--- a/src/main/java/com/whyc/service/DefectiveProductsService.java
+++ b/src/main/java/com/whyc/service/DefectiveProductsService.java
@@ -58,6 +58,7 @@
defective.setSenderName(senderName);
Date date=new Date();
defective.setRecordTime(date);
+ defective.setRestProduct(defective.getBadProduct());
if(defective.getStartTime()==null){
//淇濆瓨
defective.setStartTime(date);
@@ -180,8 +181,9 @@
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.set("receiver_ids",defectiveHis.getReceiverIds());
wrapper.set("receiver_names",defectiveHis.getReceiverNames());
- wrapper.set("bad_product",defectiveHis.getBadProduct());
- if(defectiveHis.getBadProduct()==0){
+ int resProduct=defective.getRestProduct()-defectiveHis.getDelProduct();
+ wrapper.set("rest_product",resProduct);
+ if(resProduct==0){
defectiveHis.setConfirmStatus(2);//涓嶈壇鍝佹暟閲忎负0缁撴潫
}else {
defectiveHis.setConfirmStatus(1);
@@ -190,7 +192,6 @@
wrapper.set("note",defectiveHis.getNote());
wrapper.eq("id",defectiveHis.getDeftId());
mapper.update(null,wrapper);
-
//璁板綍澶勭悊璁板綍
defectiveHisService.updateDefective(defective,defectiveHis,multipartFileList);
@@ -231,7 +232,7 @@
wrapper.set("confirm_status",3);//褰掓。
wrapper.set("receiver_ids","");
wrapper.set("receiver_names","");
- wrapper.set("bad_product",0);
+ wrapper.set("rest_product",0);
wrapper.set("note","");
wrapper.eq("id",deftId);
mapper.update(null,wrapper);
@@ -240,7 +241,7 @@
defectiveHis.setDeftId(deftId);
defectiveHis.setDelId(ActionUtil.getUser().getId().intValue());
defectiveHis.setConfirmStatus(3);
- defectiveHis.setBadProduct(0);
+ defectiveHis.setDelProduct(0);
defectiveHis.setDelId(ActionUtil.getUser().getId().intValue());
defectiveHisService.stopDefective(defectiveHis);
return new Response().set(1,true);
--
Gitblit v1.9.1