From 464b41d1c0098dde4738c0577c5e6f162b46b349 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 31 三月 2022 10:38:17 +0800
Subject: [PATCH] .
---
src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java
index c7adda7..620567e 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java
@@ -6,7 +6,9 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import zy.cloud.wms.manager.entity.Quality;
import zy.cloud.wms.manager.entity.QualityDetl;
+import zy.cloud.wms.manager.entity.ReceiveDetl;
import zy.cloud.wms.manager.service.QualityDetlService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -15,6 +17,8 @@
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import zy.cloud.wms.manager.service.QualityService;
+import zy.cloud.wms.manager.service.ReceiveDetlService;
import java.util.*;
@@ -23,6 +27,10 @@
@Autowired
private QualityDetlService qualityDetlService;
+ @Autowired
+ private QualityService qualityService;
+ @Autowired
+ private ReceiveDetlService receiveDetlService;
@RequestMapping(value = "/qualityDetl/{id}/auth")
@ManagerAuth
@@ -52,7 +60,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.eq(entry.getKey(), val);
}
}
}
@@ -70,6 +78,22 @@
if (Cools.isEmpty(qualityDetl) || null==qualityDetl.getId()){
return R.error();
}
+ if(!Cools.isEmpty(qualityDetl.getQuaStatus())){
+ Quality quality= qualityService.selectOne(new EntityWrapper<Quality>().eq("bill_no",qualityDetl.getBillNo()));
+// if(!Cools.isEmpty(quality)) {
+// quality.setAuditStatus(Short.valueOf("1"));
+// qualityService.updateById(quality);
+// }
+ ReceiveDetl receiveDetl = receiveDetlService.selectOne(new EntityWrapper<ReceiveDetl>()
+ .eq("order_no",quality.getUuid()).eq("matnr",qualityDetl.getMatnr()));
+ if(!Cools.isEmpty(receiveDetl)){
+ receiveDetl.setQuaStatus(qualityDetl.getQuaStatus());
+ receiveDetlService.update(receiveDetl,new EntityWrapper<ReceiveDetl>()
+ .eq("order_no",quality.getUuid()).eq("matnr",qualityDetl.getMatnr()));
+ }
+ }
+ qualityDetl.setQuaUser(getUserId());
+ qualityDetl.setQuaDate(new Date());
qualityDetlService.updateById(qualityDetl);
return R.ok();
}
--
Gitblit v1.9.1