ERP_override.git

			@@ -2,6 +2,8 @@

			import cn.dev33.satoken.annotation.SaCheckPermission;
			import com.example.erp.common.Constants;
			import com.example.erp.dto.pp.FlowCardDTO;
			import com.example.erp.dto.pp.TeamOutputDTO;
			import com.example.erp.entity.pp.FlowCard;
			import com.example.erp.entity.sd.DeliveryDetail;
			import com.example.erp.entity.sd.Order;
			@@ -10,12 +12,16 @@
			import com.example.erp.entity.sd.OrderGlassDetail;
			import com.example.erp.exception.ServiceException;
			import com.example.erp.service.pp.FlowCardService;
			import com.example.erp.tools.DownExcel;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;

			import javax.servlet.http.HttpServletResponse;
			import java.io.IOException;
			import java.sql.Date;
			import java.util.List;
			import java.util.Map;

			@RestController
			@@ -28,14 +34,13 @@
			//流程卡管理查询
			@ApiOperation("流程卡管理查询接口")
			@SaCheckPermission("selectProcessCard.search")
			@PostMapping("/flowCard/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}")
			@PostMapping("/flowCard/{pageNum}/{pageSize}/{selectDate}")
			public Result dateProcess(
			@PathVariable Integer pageNum,
			@PathVariable Integer pageSize,
			@PathVariable Date selectTime1,
			@PathVariable Date selectTime2,
			@PathVariable List<String> selectDate,
			@RequestBody FlowCard flowCard) {
			return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize, selectTime1, selectTime2, flowCard));
			return Result.seccess(flowCardService.selectProcessCard(pageNum, pageSize,selectDate, flowCard));

			}

			@@ -159,15 +164,16 @@

			@ApiOperation("流程卡打印查询接口")
			@SaCheckPermission("selectPrintFlowCard.search")
			@PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
			@PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}/{state}")
			public Result selectPrintFlowCard(
			@PathVariable Date selectTime1,
			@PathVariable Date selectTime2,
			@PathVariable String orderId,
			@PathVariable String project,
			@PathVariable String userId,
			@PathVariable Integer state,
			@RequestBody FlowCard flowCard) {
			return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId, flowCard));
			return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId,state, flowCard));
			}

			@ApiOperation("流程卡明细查询接口")
			@@ -181,20 +187,23 @@
			}

			@ApiOperation("打印流程卡数据查询接口")
			@PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}")
			@PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}/{flashback}/{compound}/{landingSequence}")
			public Result getSelectPrinting(
			@PathVariable String printMerge,
			@PathVariable String printLike,
			@PathVariable String merge,
			@PathVariable String flashback,
			@PathVariable String compound,
			@PathVariable String landingSequence,
			@RequestBody Map<String, Object> object) {
			return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge));
			return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge,flashback,compound,landingSequence));
			}

			@ApiOperation("工程打印流程卡数据查询接口")
			@PostMapping("/getSelectPrintProject/{printProject}/{merge}")
			@PostMapping("/getSelectPrintProject/{printProject}/{merge}/{flashback}/{landingSequence}")
			public Result getSelectPrintProject(
			@PathVariable String printProject,@PathVariable String merge) {
			return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge));
			@PathVariable String printProject,@PathVariable String merge,@PathVariable String flashback,@PathVariable String landingSequence) {
			return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge,flashback,landingSequence));
			}

			@ApiOperation("打印标签数据查询接口")
			@@ -243,6 +252,15 @@
			return Result.seccess(flowCardService.updateComposingSv(object));
			}

			@ApiOperation("复选框撤销可排版状态")
			@SaCheckPermission("selectProcessCard.review")
			@PostMapping("/revokeComposing")
			public Result revokeComposing(
			@RequestBody Map<String, Object> object
			) {

			return Result.seccess(flowCardService.revokeComposingSv(object));
			}
			@ApiOperation("流程卡打印明细数据排序查询接口")
			@PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
			public Result printFlowCardDetails(@PathVariable String processId,
			@@ -365,14 +383,21 @@
			}

			@ApiOperation("合并流程卡接口")
			@PostMapping("/mergeFlowCard")
			public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
			return Result.seccess(flowCardService.mergeFlowCard(object));
			@PostMapping("/mergeFlowCard/{merge}")
			public Result mergeFlowCard(@RequestBody Map<String, Object> object,
			@PathVariable Integer merge) {
			return Result.seccess(flowCardService.mergeFlowCard(object,merge));
			}
			@ApiOperation("汉玻获取流程卡接口")
			@PostMapping("/getProcessCardList/hanbo")
			public Result getProcessCard(@RequestBody Map<String,String> processCards) {
			return Result.seccess(flowCardService.getProcessCard(processCards));
			}

			@ApiOperation("获取流程卡接口")
			@PostMapping("/getProcessCardList/all")
			public Result getProcessCardAll(@RequestBody Map<String,String> processCards) {
			return Result.seccess(flowCardService.getProcessCardAll(processCards));
			}

			@ApiOperation("复选框删除流程卡")
			@@ -446,4 +471,13 @@
			public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
			return Result.seccess(flowCardService.processCardAutoRack(object));
			}

			@ApiOperation("流程卡查询导出")
			@PostMapping("/exportDateProcess")
			public void exportDateProcess(HttpServletResponse response,
			@RequestBody Map<String, Object> dates
			) throws IOException, IllegalAccessException, InstantiationException {
			//参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
			DownExcel.download(response, FlowCardDTO.class, flowCardService.exportDateProcessSv(dates), "DateProcess");
			}
			}