From 844e8ae99ae55eb688a2f302b9dc7e011e71e99b Mon Sep 17 00:00:00 2001 From: gt-fuwuqi <3272660260@qq.com> Date: 星期一, 04 十一月 2024 08:56:49 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OrderController.java | 12 +++++++++++- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4 ++-- src/main/resources/mapper/WrkMastMapper.xml | 4 ++-- src/main/java/com/zy/asrs/controller/OrderDetlController.java | 6 +++--- 4 files changed, 18 insertions(+), 8 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..a688989 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 @@ -49,10 +51,18 @@ 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") diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java index 1206ea0..6e35693 100644 --- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java +++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java @@ -27,10 +27,10 @@ @Autowired private OrderDetlService orderDetlService; - @RequestMapping("/orderDetl/list/pda/auth") - public R getPdaOrderDetl(@RequestParam String orderNo) { + @PostMapping("/orderDetl/list/pda/auth") + public R getPdaOrderDetl(@RequestBody Map<String,Object> map) { EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>(); - wrapper.eq("order_no", orderNo); + wrapper.eq("order_no", map.get("orderNo")); return R.ok(orderDetlService.selectList(wrapper)); } diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index f494efc..40d5d42 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -947,7 +947,7 @@ String locNo = ""; // 寰呬慨鏀圭洰鏍囧簱浣� String locSts = ""; // 寰呬慨鏀圭洰鏍囧簱浣嶇姸鎬� // 鍏ュ簱鍙栨秷锛堜慨鏀圭洰鏍囧簱浣嶏級 - if (wrkMast.getWrkSts() < 4) { + if (wrkMast.getIoType() <100 ) { locNo = wrkMast.getLocNo(); locSts = "O"; @@ -964,7 +964,7 @@ locMastService.updateById(locMast); } // 鍑哄簱鍙栨秷锛堜慨鏀规簮搴撲綅锛� - } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) { + } else if (wrkMast.getIoType() >=100) { locNo = wrkMast.getSourceLocNo(); // 鍑哄簱 ===>> F.鍦ㄥ簱 if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) { diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml index 555666b..54d0dbf 100644 --- a/src/main/resources/mapper/WrkMastMapper.xml +++ b/src/main/resources/mapper/WrkMastMapper.xml @@ -70,8 +70,8 @@ select * from asr_wrk_mast where wrk_sts=5 or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp)) - or (wrk_sts=15 and dateadd(mi,5,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp)) - or (wrk_sts=15 and dateadd(mi,5,crn_end_time) <= getdate() and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp)) + or (wrk_sts=15 and (dateadd(mi,5,crn_end_time) <= getdate() or dateadd(mi,1,modi_time) <= getdate()) and wrk_no not in (select wrk_no from asr_bas_devp)) + or (wrk_sts=15 and (dateadd(mi,5,crn_end_time) <= getdate() or dateadd(mi,1,modi_time) <= getdate()) and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp)) order by io_time,wrk_no asc </select> -- Gitblit v1.9.1