From e0844386d662b4aa5d01e8a8259d3088ce0de9c8 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 15 Jun 2023 14:20:12 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MdPbMeasureunitController.java | 79 +++++++++--------- .../master/IMdPbMeasureunitService.java | 15 ++++ .../service/master/dao/MdPbMeasureunit.java | 6 +- .../service/master/dto/UnitQuery.java | 24 ++++++ .../impl/MdPbMeasureunitServiceImpl.java | 49 +++++++++++ .../point/dao/mapper/SchBasePointMapper.java | 2 + .../point/dao/mapper/SchBasePointMapper.xml | 27 ++++++ .../impl/StIvtCheckmstBcpServiceImpl.java | 83 +++++++++++-------- .../impl/StIvtShutframeinvBcpServiceImpl.java | 28 +++++-- .../wms/basedata/master/mdPbMeasureunit.js | 10 +-- .../master/measure/index.vue | 2 +- .../semiproduct/semiProductIn/AddDialog.vue | 55 ++++++------ .../semiproduct/semiproductout/AddDialog.vue | 9 +- 13 files changed, 268 insertions(+), 121 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dto/UnitQuery.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java index ef19c703..3b016e2a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java @@ -2,20 +2,27 @@ package org.nl.wms.masterdata_manage.master.controller.measureunit; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.masterdata_manage.备份master.service.UnitService; -import org.nl.wms.masterdata_manage.备份master.service.dto.UnitDto; -import org.springframework.data.domain.Pageable; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService; +import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; +import org.nl.wms.masterdata_manage.service.master.dto.UnitQuery; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckdtlBcp; +import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckmstBcp; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Map; +import java.util.List; /** * @author loujf @@ -27,48 +34,40 @@ import java.util.Map; @RequestMapping("/api/mdPbMeasureunit") @Slf4j public class MdPbMeasureunitController { - private final UnitService unitService; + + @Autowired + private IMdPbMeasureunitService measureunitService; @GetMapping - @Log("查询计量单位") + @Log("查询单位") @ApiOperation("查询计量单位") - //@PreAuthorize("@el.check('Unit:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(unitService.queryAll(whereJson,page),HttpStatus.OK); + public ResponseEntity query(UnitQuery query, PageQuery page) { + return new ResponseEntity<>(measureunitService.pageQuery(query, page), HttpStatus.OK); } - @PostMapping + @PostMapping("/add") @Log("新增计量单位") @ApiOperation("新增计量单位") - //@PreAuthorize("@el.check('Unit:add')") - public ResponseEntity create(@Validated @RequestBody UnitDto dto){ - unitService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改计量单位") - @ApiOperation("修改计量单位") - //@PreAuthorize("@el.check('Unit:edit')") - public ResponseEntity update(@Validated @RequestBody UnitDto dto){ - unitService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除计量单位") - @ApiOperation("删除计量单位") - //@PreAuthorize("@el.check('Unit:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody String[] ids) { - unitService.deleteAll(ids); + public ResponseEntity create(@RequestBody JSONObject whereJson) { + measureunitService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); } - @GetMapping("/getUnit") - @Log("查询单位下拉框") - @ApiOperation("查询仓库下拉框") - //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity queryUnit(@RequestParam Map whereJson) { - return new ResponseEntity<>(unitService.getUnit(whereJson), HttpStatus.OK); + @PostMapping("/update") + @Log("修改计量单位") + @ApiOperation("修改计量单位") + public ResponseEntity update(@RequestBody JSONObject whereJson) { + measureunitService.update(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/delete") + @Log("删除计量单位") + @ApiOperation("删除计量单位") + public ResponseEntity delete(@RequestBody Long[] ids){ + for (Long id : ids) { + measureunitService.removeById(id); + } + return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbMeasureunitService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbMeasureunitService.java index 6ec231c9..ff8efa6b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbMeasureunitService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbMeasureunitService.java @@ -1,7 +1,10 @@ package org.nl.wms.masterdata_manage.service.master; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; +import org.nl.wms.masterdata_manage.service.master.dto.UnitQuery; /** *

@@ -13,4 +16,16 @@ import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; */ public interface IMdPbMeasureunitService extends IService { + /** + * 分页查询 + * @param query,page / + * @return JSONObject + */ + Object pageQuery(UnitQuery query, PageQuery page); + + void create(JSONObject jo); + + void update(JSONObject jo); + + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbMeasureunit.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbMeasureunit.java index 8b9c00ef..f539036e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbMeasureunit.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbMeasureunit.java @@ -7,8 +7,6 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Date; /** *

@@ -64,7 +62,7 @@ public class MdPbMeasureunit implements Serializable { /** * 创建时间 */ - private Date create_time; + private String create_time; /** * 修改人 @@ -79,7 +77,7 @@ public class MdPbMeasureunit implements Serializable { /** * 修改时间 */ - private Date update_time; + private String update_time; /** * 外部标识 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dto/UnitQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dto/UnitQuery.java new file mode 100644 index 00000000..1d0267c8 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dto/UnitQuery.java @@ -0,0 +1,24 @@ +package org.nl.wms.masterdata_manage.service.master.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.masterdata_manage.service.master.dao.MdPbMeasureunit; +import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class UnitQuery extends BaseQuery { + + private String search; + @Override + public void paramMapping() { + super.doP.put("search", QParam.builder().k(new String[]{"unit_name"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbMeasureunitServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbMeasureunitServiceImpl.java index 7399e4f4..2669747a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbMeasureunitServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbMeasureunitServiceImpl.java @@ -1,11 +1,25 @@ package org.nl.wms.masterdata_manage.service.master.impl; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import io.jsonwebtoken.lang.Assert; +import org.apache.catalina.security.SecurityUtil; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.BaseQuery; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService; import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; import org.nl.wms.masterdata_manage.service.master.dao.mapper.MdPbMeasureunitMapper; +import org.nl.wms.masterdata_manage.service.master.dto.UnitQuery; +import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckmstBcp; import org.springframework.stereotype.Service; +import java.math.BigDecimal; + /** *

* 计量单位表 服务实现类 @@ -17,4 +31,39 @@ import org.springframework.stereotype.Service; @Service public class MdPbMeasureunitServiceImpl extends ServiceImpl implements IMdPbMeasureunitService { + @Override + public Object pageQuery(UnitQuery query, PageQuery page) { + Page pageQuery = this.page(page.build(), query.build()); + return TableDataInfo.build(pageQuery); + } + + @Override + public void create(JSONObject jo) { + String unit_code = jo.getString("unit_code"); + String unit_name = jo.getString("unit_name"); + String ext_id = jo.getString("ext_id"); + BigDecimal qty_precision = jo.getBigDecimal("qty_precision"); + boolean is_used = jo.getBoolean("is_used"); + MdPbMeasureunit unit = new MdPbMeasureunit(); + unit.setMeasure_unit_id(IdUtil.getStringId()); + unit.setUnit_code(unit_code); + unit.setUnit_name(unit_name); + unit.setQty_precision(qty_precision); + unit.setExt_id(ext_id); + unit.setIs_used(is_used); + unit.setCreate_id(SecurityUtils.getCurrentUserId()); + unit.setCreate_name(SecurityUtils.getCurrentNickName()); + unit.setCreate_time(DateUtil.now()); + this.save(unit); + } + + @Override + public void update(JSONObject jo) { + Assert.notNull(new Object[]{jo, jo.get("measure_unit_id")}, "请求参数不能为空"); + MdPbMeasureunit mst = jo.toJavaObject(MdPbMeasureunit.class); + mst.setUpdate_id(SecurityUtils.getCurrentUserId()); + mst.setUpdate_name(SecurityUtils.getCurrentNickName()); + mst.setUpdate_time(DateUtil.now()); + this.updateById(mst); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.java index 341ea31a..9ad86230 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.java @@ -30,6 +30,8 @@ public interface SchBasePointMapper extends BaseMapper { */ List selectPoint(Map map); + List canUsePoint(Map map); + Map getDeviceWorkprodure(String pointCode); Map getWorkprodure(@Param("workprodureId") String workprodureId, @Param("workprodureCode") String workprodureCode); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml index 53367d6c..ff9356b2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml @@ -89,6 +89,33 @@ AND ruledis.load_series >= #{loadSeries} + + +