bonus
/
gz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改导出 及明细

This commit is contained in:
haozq 2024-11-11 14:38:54 +08:00
parent 54cc2a1a38
commit 0b430c0cc7
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java
View File

@ -18,10 +18,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
@ -54,7 +51,7 @@ public class ExportController {
* @param o
*/
@PostMapping("export")
public void export(HttpServletRequest request, HttpServletResponse response, PlanApplyBean o) {
public void export(HttpServletRequest request, HttpServletResponse response,@RequestBody PlanApplyBean o) {
try {
List<PlanApplyBean> list = service.getProPlanListByProId(o);
if(StringUtils.isEmpty(list)){
@ -82,7 +79,7 @@ public class ExportController {
* @param o
*/
@PostMapping("exportDetail")
public void exportDetail(HttpServletRequest request, HttpServletResponse response,PlanApplyBean o) {
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PlanApplyBean o) {
try {
List<PlanDataDetailBean> results = planService.getDetailsList(o);
ExportParams exportParams = new ExportParams("机具明细", "机具明细", ExcelType.XSSF);
@ -105,15 +102,15 @@ public class ExportController {
* @param o
*/
@PostMapping("exportFhList")
public void exportFhList(HttpServletRequest request, HttpServletResponse response, ProPlanInfoVo o) {
public void exportFhList(HttpServletRequest request, HttpServletResponse response,@RequestBody ProPlanInfoVo o) {
try {
List<ProPlanInfoVo> results = service.getProPlanPage(o);
results.forEach(vo->{
if(vo.getStatus()==0){
if("0".equals(vo.getStatus())){
vo.setStatusName("未发货");
}else if(vo.getStatus()==1){
}else if("1".equals(vo.getStatus())){
vo.setStatusName("部分发货");
}else if(vo.getStatus()==2){
}else if("2".equals(vo.getStatus())){
vo.setStatusName("全部发货");
}
vo.setProgress(vo.getProgress()+"%");
@ -139,7 +136,7 @@ public class ExportController {
* @param o
*/
@PostMapping("exportAllFhList")
public void exportAllFhList(HttpServletRequest request, HttpServletResponse response, ProNeedInfo o) {
public void exportAllFhList(HttpServletRequest request, HttpServletResponse response,@RequestBody ProNeedInfo o) {
try {
List<ProNeedInfo> list = service.getPorInfoDetail2(o);
List<ProNeedInfoExport> exports=new ArrayList<>();
@ -168,7 +165,7 @@ public class ExportController {
* @param o
*/
@PostMapping("exportDataInfo")
public void exportDataInfo(HttpServletRequest request, HttpServletResponse response, ProNeedInfo o) {
public void exportDataInfo(HttpServletRequest request, HttpServletResponse response,@RequestBody ProNeedInfo o) {
try {
List<ProNeedInfo> list = service.getDataInfoByPage(o);
List<ProNeedEXportInfo> exports=new ArrayList<>();
@ -196,7 +193,7 @@ public class ExportController {
* @param o
*/
@PostMapping("exportDfhList")
public void exportDfhList(HttpServletRequest request, HttpServletResponse response, ProNeedInfo o) {
public void exportDfhList(HttpServletRequest request, HttpServletResponse response,@RequestBody ProNeedInfo o) {
try {
List<ProNeedInfo> list = service.getDfhList(o);
List<ProNeedInfoWfhExport> exports=new ArrayList<>();
@ -225,7 +222,7 @@ public class ExportController {
* @param o
*/
@PostMapping("exportDetails")
public void exportDetails(HttpServletRequest request, HttpServletResponse response, ProNeedInfo o) {
public void exportDetails(HttpServletRequest request, HttpServletResponse response,@RequestBody ProNeedInfo o) {
try {
List<PlanApplyBean> list = service.getDataPlanByPage(o);
List<PlanApplyBeanExport> exports=new ArrayList<>();
@ -255,7 +252,7 @@ public class ExportController {
* @param o
*/
@PostMapping("exportPcList")
public void exportPcList(HttpServletRequest request, HttpServletResponse response, ProNeedInfo o) {
public void exportPcList(HttpServletRequest request, HttpServletResponse response,@RequestBody ProNeedInfo o) {
try {
List<ProNeedInfo> list = service.getOutDetailList(o);
String day=o.getCurryDay();

3
src/main/java/com/bonus/gzgqj/business/plan/entity/ProPlanInfoVo.java
View File

@ -32,7 +32,8 @@ public class ProPlanInfoVo extends PageInfo {
* 状态
*/
private int status;
private String status;
@Excel(name = "发货状态", width = 10.0,height = 20.0, orderNum = "5")
private String statusName;
/**

4
src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java
View File

@ -392,9 +392,9 @@ public class PlanOutServiceImpl implements PlanOutService{
data.setTzNum(allTzNum);
//更新 发货状态
if(needNum>outNum+allTzNum){
data.setStatus(1);
data.setStatus("1");
}else {
data.setStatus(2);
data.setStatus("2");
}
data.setLastDay(vo.getCreateDay());
//非计划发货数量