| | |
| | | package com.ruoyi.basic.controller; |
| | | package com.ruoyi.inspect.controller; |
| | | |
| | | import com.alibaba.fastjson.JSON; |
| | | import com.alibaba.fastjson.JSONArray; |
| | |
| | | return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory)); |
| | | } |
| | | |
| | | //todo: 下单需要修改 |
| | | @ApiOperation(value = "添加检验下单数据") |
| | | @PostMapping("/addInsOrder") |
| | | public Result<?> addInsOrder(String str) { |
| | | Map<String, Object> map = JSON.parseObject(str, Map.class); |
| | | JSONArray jsonArray = JSON.parseArray(map.get("list")+""); |
| | | List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class); |
| | | InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class); |
| | | List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+""); |
| | | return Result.success(insOrderService.addInsOrder(list, insOrder, pairing)); |
| | | public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) { |
| | | return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder())); |
| | | } |
| | | |
| | | @ApiOperation(value = "查询订单最长预计时间") |
| | | @GetMapping("/selectOrderManDay") |
| | | public Result<?> selectOrderManDay(Integer id) { |
| | | int day = insProductService.selectOrderManDay(id); |
| | | return Result.success("成功", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); |
| | | return Result.success(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); |
| | | } |
| | | |
| | | @ApiOperation(value = "查询检验下单内容详情") |
| | |
| | | @ApiOperation(value = "通过检验单模板id获取检验单模板内容") |
| | | @GetMapping("/selectInsOrderTemplateById") |
| | | public Result<?> selectInsOrderTemplateById(Integer id) { |
| | | return Result.success("成功", insOrderTemplateService.selectInsOrderTemplateById(id)); |
| | | return Result.success(insOrderTemplateService.selectInsOrderTemplateById(id)); |
| | | } |
| | | |
| | | @ApiOperation(value = "删除检验单模板") |
| | |
| | | return Result.success(); |
| | | } |
| | | |
| | | @Scheduled(fixedDelay = 1200000) |
| | | public void getIfsOrderTiming() { |
| | | insOrderService.getIfsOrder(); |
| | | } |
| | | |
| | | |
| | | @ApiOperation(value = "修改订单单号") |
| | | @PostMapping("/updateEntrustCode") |
| | |
| | | public Result<?> getRetestResult(Integer insProductId) { |
| | | return Result.success(insOrderService.getRetestResult(insProductId)); |
| | | } |
| | | |
| | | |
| | | |
| | | @ApiOperation(value = "铜单丝下单") |
| | | @PostMapping("/addRawCopperOrder") |
| | | public Result<?> addRawCopperOrder(String str) { |
| | | Map<String, Object> map = JSON.parseObject(str, Map.class); |
| | | JSONArray jsonArray = JSON.parseArray(map.get("list")+""); |
| | | List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class); |
| | | CopperInsOrderDto CopperInsOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), CopperInsOrderDto.class); |
| | | return Result.success(insOrderService.addRawCopperOrder(list, CopperInsOrder)); |
| | | } |
| | | |
| | | |
| | | @ApiOperation(value = "修改委托编号") |
| | | @PostMapping("/updateOrderEntrustCode") |
| | |
| | | } |
| | | |
| | | @ApiOperation(value = "删除退回订单") |
| | | @GetMapping("/delInsOrder") |
| | | @DeleteMapping("/delInsOrder") |
| | | public Result<?> delInsOrder(Integer insOrderId) { |
| | | // 查询订单 |
| | | InsOrder order = insOrderService.getById(insOrderId); |