From c2be773489f4541daba9650c24df5b8dadcf33a3 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期五, 06 十二月 2024 15:15:01 +0800 Subject: [PATCH] agv站点修改 --- src/main/java/com/zy/asrs/controller/OrderController.java | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index f4fbe48..6ed6449 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -14,11 +14,13 @@ import com.zy.asrs.service.*; import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; +import io.swagger.models.auth.In; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import javax.print.Doc; import java.util.*; @RestController @@ -43,16 +45,37 @@ @Autowired private WrkMastLogService wrkMastLogService; + @RequestMapping(value = "/order/search/pda/auth") + @ManagerAuth + public R pdaOrderSearch(@RequestParam(required = false)String condition){ + EntityWrapper<Order> wrapper = new EntityWrapper<>(); + if (!Cools.isEmpty(condition)) { +// wrapper.like("matnr", condition).or().like("maktx", condition); + wrapper.like("order_no", condition); + } + wrapper.orderBy("create_time", false); + List<Order> mats = orderService.selectList(wrapper); + return R.ok().add(mats); + } + @RequestMapping(value = "/order/list/pda/page/auth") @ManagerAuth public R pdaPageList(@RequestParam(required = true)Long tagId, @RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit){ + List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1)); + ArrayList<Integer> arrayList = new ArrayList<>(); + docTypes.forEach(docType -> { + arrayList.add(docType.getDocId().intValue()); + }); EntityWrapper<Order> wrapper = new EntityWrapper<>(); // wrapper.eq("tag_id", tagId); + wrapper.in("doc_type", arrayList); + wrapper.in("settle",1,2); wrapper.orderBy("create_time", false); - return R.ok().add(orderService.selectPage(new Page<>(curr, limit), wrapper)); + Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper); + return R.ok().add(orderPage); } @RequestMapping(value = "/order/nav/list/auth") -- Gitblit v1.9.1