From 298b5b1e1d4f975687228270faee05f0f665d251 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 29 May 2023 13:02:05 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=B7=A5=E5=8D=95=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/PdmBiDeviceController.java | 40 +++++++++++++------ .../ProduceshiftorderController.java | 21 +++++++++- .../dao/mapper/PdmProduceWorkorderMapper.xml | 13 +++--- .../xml/PdmProduceWorkorderrecordMapper.xml | 3 ++ .../mapper/xml/SchCachelineVehicleMapper.xml | 3 ++ 5 files changed, 61 insertions(+), 19 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java index c9ca3d46..19f96d7c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/PdmBiDeviceController.java @@ -1,15 +1,20 @@ package org.nl.wms.product_manage.controller.device; +import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; import org.nl.wms.product_manage.service.device.dao.PdmBiDevice; +import org.nl.wms.product_manage.service.device.dto.DeviceQuery; import org.nl.wms.product_manage.备份pdm.service.DeviceService; import org.nl.wms.product_manage.备份pdm.service.dto.DeviceDto; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +24,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -31,23 +37,33 @@ import java.util.Map; @Slf4j public class PdmBiDeviceController { @Autowired - private DeviceService deviceService; + private DeviceService deviceService; @Autowired private IPdmBiDeviceService iDeviceService; @GetMapping @Log("查询生产设备") @ApiOperation("查询生产设备") - //@PreAuthorize("@el.check('device:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(deviceService.queryAll(whereJson,page),HttpStatus.OK); + @SaIgnore + public ResponseEntity query(DeviceQuery query, PageQuery page) { + Page result = iDeviceService.page(page.build(PdmBiDevice.class), query.build()); + return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK); + } + + @PostMapping("/list") + @Log("查询生产设备列表") + @ApiOperation("查询生产设备列表") + @SaIgnore + public ResponseEntity queryList (@RequestBody DeviceQuery query){ + List> list = iDeviceService.listMaps(query.build().select("device_code", "device_name")); + return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } @PostMapping @Log("新增生产设备") @ApiOperation("新增生产设备") //@PreAuthorize("@el.check('device:add')") - public ResponseEntity create( @RequestBody JSONObject form){ + public ResponseEntity create (@RequestBody JSONObject form){ PdmBiDevice device = form.toJavaObject(PdmBiDevice.class); device.setCreate_id(SecurityUtils.getCurrentUserId()); device.setCreate_name(SecurityUtils.getCurrentNickName()); @@ -60,7 +76,7 @@ public class PdmBiDeviceController { @Log("修改生产设备") @ApiOperation("修改生产设备") //@PreAuthorize("@el.check('device:edit')") - public ResponseEntity update(@Validated @RequestBody JSONObject form){ + public ResponseEntity update (@Validated @RequestBody JSONObject form){ PdmBiDevice device = form.toJavaObject(PdmBiDevice.class); device.setUpdate_id(SecurityUtils.getCurrentUserId()); device.setUpdate_name(SecurityUtils.getCurrentNickName()); @@ -73,7 +89,7 @@ public class PdmBiDeviceController { @ApiOperation("删除生产设备") //@PreAuthorize("@el.check('device:del')") @DeleteMapping - public ResponseEntity delete(@RequestBody String[] ids) { + public ResponseEntity delete (@RequestBody String[]ids){ deviceService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } @@ -82,16 +98,16 @@ public class PdmBiDeviceController { @Log("工序下拉") @ApiOperation("工序下拉") //@PreAuthorize("@el.check('device:list')") - public ResponseEntity getWorkprocedure(){ - return new ResponseEntity<>(deviceService.getWorkprocedure(),HttpStatus.OK); + public ResponseEntity getWorkprocedure () { + return new ResponseEntity<>(deviceService.getWorkprocedure(), HttpStatus.OK); } @GetMapping("/getDeviceList") @Log("设备下拉框") @ApiOperation("设备下拉框") //@PreAuthorize("@el.check('device:list')") - public ResponseEntity getDeviceList(){ - return new ResponseEntity<>(deviceService.getDeviceList(),HttpStatus.OK); + public ResponseEntity getDeviceList () { + return new ResponseEntity<>(deviceService.getDeviceList(), HttpStatus.OK); } - } + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java index 553634df..e2aac724 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java @@ -70,7 +70,8 @@ public class ProduceshiftorderController{ if(null == param) { throw new BizCoreException(ResultCode.VALIDATE_FAILED); } - return new ResponseEntity<>(produceshiftorderService.getOrderList(param, page), HttpStatus.OK); + List list = iPdmProduceWorkorderService.getOrderList(param, page); + return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } @PostMapping("/getOrderList2") @@ -134,6 +135,24 @@ public class ProduceshiftorderController{ return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/deleteReport") + @Log("deleteReport") + @ApiOperation("deleteReport") + public ResponseEntity deleteReport(@RequestBody JSONObject param) { + iPdmProduceWorkorderService.removeById(param.getString("macoperate_id")); + return new ResponseEntity<>(HttpStatus.OK); + } + + + @PostMapping("/updateReport") + @Log("报工数修改") + @ApiOperation("报工数修改") + public ResponseEntity updateReport(@RequestBody JSONObject param) { + iPdmProduceWorkorderService.updateReport(param); + return new ResponseEntity<>(HttpStatus.OK); + } + + @GetMapping("/getUser") @Log("查询操作人员") @ApiOperation("查询操作人员") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml index 282e0718..f02d2005 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml @@ -58,11 +58,11 @@ +