From ef3baa529cc9b6ff670687e1a49fa7f4c438dfed Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 24 Jan 2024 08:43:50 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=89=8B=E6=8C=81=E6=B5=B7=E6=9F=94?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E9=A1=BA=E5=BA=8F=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PdaStHrBcpOrderController.java | 83 +++++++++++++++++++ .../service/dto/HrBcpIostorOrderQuery.java | 25 ++++++ 2 files changed, 108 insertions(+) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStHrBcpOrderController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/HrBcpIostorOrderQuery.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStHrBcpOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStHrBcpOrderController.java new file mode 100644 index 00000000..016b2583 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStHrBcpOrderController.java @@ -0,0 +1,83 @@ +package org.nl.wms.storage_manage.pda.controller; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.storage_manage.pda.service.PdaStHrBcpInService; +import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvOrderService; +import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dao.StIvtIostorinvOrder; +import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dto.HrBcpIostorOrderQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + *

+ * 手持半成品出入库顺序 前端控制器 + *

+ * + * @author Liuxy + * @since 2023-08-30 + */ +@RestController +@RequestMapping("/api/pda/hrBcp/order") +public class PdaStHrBcpOrderController { + + @Autowired + protected IStIvtIostorinvOrderService iStIvtIostorinvOrderService; // 出入顺序服务 + + @GetMapping + @Log("获取出入库顺序表") + @SaIgnore + public ResponseEntity getMaterial(HrBcpIostorOrderQuery query, PageQuery page) { + Page result = iStIvtIostorinvOrderService.page(page.build(), query.build()); + return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK); + } + + @PostMapping("/list") + @Log("获取出入库顺序表") + @SaIgnore + public ResponseEntity getorders(@RequestBody JSONObject param) { + String bar_code = param.getString("bar_code"); + HrBcpIostorOrderQuery query = new HrBcpIostorOrderQuery(); + if (StringUtils.isNotEmpty(bar_code)){ + query.setBar_code(bar_code); + } + Page result = iStIvtIostorinvOrderService.page(new Page<>(param.getInteger("page"),param.getInteger("size")), query.build()); + return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK); + } + + + @PostMapping + @Log("update顺序表") + @SaIgnore + public ResponseEntity getMaterial(@RequestBody StIvtIostorinvOrder order) { + if (order!=null){ + iStIvtIostorinvOrderService.updateById(order); + } + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/delete") + @Log("删除入库顺序表") + @SaIgnore + public ResponseEntity delete(@RequestBody Long[] ids){ + if (ids!=null && ids.length>0){ + iStIvtIostorinvOrderService.removeByIds(Arrays.asList(ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/HrBcpIostorOrderQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/HrBcpIostorOrderQuery.java new file mode 100644 index 00000000..9ea14cf2 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/HrBcpIostorOrderQuery.java @@ -0,0 +1,25 @@ +package org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dto; + +import lombok.Data; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp; +import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dao.StIvtIostorinvOrder; + +/* + * @author LXY + * @Date 2023/08/01 19:49 + */ +@Data +public class HrBcpIostorOrderQuery extends BaseQuery { + /** + * 载具码 + */ + private String bar_code; + /** + * 出入库类型 + */ + private String type; + +}