From d5a456fee1dd3b6beda90ec6cc1b91814ec2750f Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 24 三月 2022 12:59:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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..0fd7e8c 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/QualityDetlController.java
@@ -6,6 +6,7 @@
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.service.QualityDetlService;
import com.core.annotations.ManagerAuth;
@@ -15,6 +16,7 @@
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 java.util.*;
@@ -23,7 +25,8 @@
@Autowired
private QualityDetlService qualityDetlService;
-
+ @Autowired
+ private QualityService qualityService;
@RequestMapping(value = "/qualityDetl/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -52,7 +55,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 +73,11 @@
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()));
+ quality.setAuditStatus(Short.valueOf("1"));
+ qualityService.updateById(quality);
+ }
qualityDetlService.updateById(qualityDetl);
return R.ok();
}
--
Gitblit v1.9.1