ERP_override.git

			@@ -3,6 +3,8 @@
			import cn.dev33.satoken.annotation.SaCheckPermission;
			import com.example.erp.common.Constants;
			import com.example.erp.common.Result;
			import com.example.erp.dto.pp.ReworkDTO;
			import com.example.erp.entity.pp.FlowCard;
			import com.example.erp.entity.pp.Rework;
			import com.example.erp.entity.sd.Delivery;
			import com.example.erp.entity.sd.OrderDetail;
			@@ -13,6 +15,7 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;

			import java.sql.Date;
			import java.util.List;
			import java.util.Map;

			@@ -37,7 +40,7 @@
			@ApiOperation("返工数据查询接口")
			@SaCheckPermission("SelectRework.search")
			@PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
			public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody Rework rework){
			public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody ReworkDTO rework){
			return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
			}

			@@ -55,4 +58,22 @@
			public Result updateRework( @RequestBody Map<String,Object> object){
			return Result.seccess(reworkService.updateRework(object));
			}

			@ApiOperation("返工流程卡明细查询接口")
			@SaCheckPermission("PrintFlowCard.search")
			@PostMapping("/selectPrint/{selectTime1}/{selectTime2}")
			public Result selectPrint(
			@PathVariable Date selectTime1,
			@PathVariable Date selectTime2,
			@RequestBody FlowCard flowCard) {
			return Result.seccess(reworkService.selectPrintSv(selectTime1,selectTime2, flowCard));

			}

			@ApiOperation("返工删除接口")
			@SaCheckPermission("SelectRework.delete")
			@PostMapping("/deleteRework")
			public Result deleteRework( @RequestBody Map<String,Object> object){
			return Result.seccess(reworkService.deleteReworkSv(object));
			}
			}