diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java index 272be715..691f7e18 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java @@ -2,7 +2,9 @@ package org.nl.wms.device_manage.controller.userdevice; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.jsonwebtoken.lang.Assert; @@ -14,14 +16,14 @@ import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.IdUtil; +import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService; import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; +import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery; import org.nl.wms.mps.service.PersoncorrdeviceService; -import org.nl.wms.mps.service.dto.PersoncorrdeviceDto; import org.springframework.data.domain.Pageable; 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.Arrays; @@ -45,7 +47,7 @@ public class PersoncorrdeviceController { @GetMapping @Log("查询人员设备维护") @ApiOperation("查询人员设备维护") - public ResponseEntity query(@RequestParam Map query, PageQuery page){ + public ResponseEntity query(DeviceUserQuery query, PageQuery page){ Page result = PageHelper.startPage(page.getPage() + 1, page.getSize()); List list = pdmBiPersoncorrdeviceService.queryAll(query); TableDataInfo build = TableDataInfo.build(list); @@ -53,24 +55,64 @@ public class PersoncorrdeviceController { return new ResponseEntity<>(build,HttpStatus.OK); } + @GetMapping("/device") + @Log("查询设备") + @ApiOperation("查询设备") + public ResponseEntity device(DeviceUserQuery query, PageQuery page){ + Page result = PageHelper.startPage(page.getPage() + 1, page.getSize()); + List list = pdmBiPersoncorrdeviceService.queryAllDevice(query); + TableDataInfo build = TableDataInfo.build(list); + build.setTotalElements(result.getTotal()); + return new ResponseEntity<>(build,HttpStatus.OK); + } + @PostMapping @Log("新增人员设备维护") @ApiOperation("新增人员设备维护") //@PreAuthorize("@el.check('personcorrdevice:add')") public ResponseEntity create(@RequestBody JSONObject entity){ Assert.notNull(entity,"请求参数不能为空"); + + PdmBiPersoncorrdevice one = pdmBiPersoncorrdeviceService.getOne( + new QueryWrapper().lambda() + .eq(PdmBiPersoncorrdevice::getUser_id, entity.getString("user_id")) + .eq(PdmBiPersoncorrdevice::getDevice_code, entity.getString("device_code")) + ); + + if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复"); + PdmBiPersoncorrdevice pdmBiPersoncorrdevice = entity.toJavaObject(PdmBiPersoncorrdevice.class); - pdmBiPersoncorrdevice.setId(IdUtil.getStringId()); + pdmBiPersoncorrdevice.setPerson_id(IdUtil.getStringId()); pdmBiPersoncorrdeviceService.save(pdmBiPersoncorrdevice); return new ResponseEntity<>(HttpStatus.CREATED); } + @PutMapping + @Log("修改人员设备维护") + @ApiOperation("修改人员设备维护") + //@PreAuthorize("@el.check('personcorrdevice:add')") + public ResponseEntity update(@RequestBody JSONObject entity){ + + PdmBiPersoncorrdevice one = pdmBiPersoncorrdeviceService.getOne( + new QueryWrapper().lambda() + .eq(PdmBiPersoncorrdevice::getUser_id, entity.getString("user_id")) + .eq(PdmBiPersoncorrdevice::getDevice_code, entity.getString("device_code")) + ); + + if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("设备重复"); + + PdmBiPersoncorrdevice pdmBiPersoncorrdevice = pdmBiPersoncorrdeviceService.getById(entity.getString("person_id")); + pdmBiPersoncorrdevice.setDevice_code(entity.getString("device_code")); + pdmBiPersoncorrdeviceService.updateById(pdmBiPersoncorrdevice); + return new ResponseEntity<>(HttpStatus.CREATED); + } + @Log("删除人员设备维护") @ApiOperation("删除人员设备维护") //@PreAuthorize("@el.check('personcorrdevice:del')") @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { + public ResponseEntity delete(@RequestBody String[] ids) { if (ids != null && ids.length>0){ pdmBiPersoncorrdeviceService.removeByIds(Arrays.asList(ids)); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java index d4b836ce..a7d9d67c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java @@ -2,9 +2,9 @@ package org.nl.wms.device_manage.service.userdevice; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.common.domain.query.PageQuery; import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery; import org.nl.wms.mps.service.dto.PersoncorrdeviceDto; import org.springframework.data.domain.Pageable; @@ -27,7 +27,7 @@ public interface IPdmBiPersoncorrdeviceService extends IService */ - List queryAll(Map whereJson); + List queryAll(DeviceUserQuery whereJson); /** @@ -80,4 +80,6 @@ public interface IPdmBiPersoncorrdeviceService extends IService queryAllDevice(DeviceUserQuery whereJson); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java index ba887e34..adbabf55 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java @@ -16,13 +16,13 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName("pdm_bi_personcorrdevice") +@TableName("mps_personcorrdevice") public class PdmBiPersoncorrdevice implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "id") - private String id; + @TableId + private String person_id; /** * 用户id */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java index 09753fe3..2b4ee409 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java @@ -1,7 +1,9 @@ package org.nl.wms.device_manage.service.userdevice.dao.mapper; +import org.apache.ibatis.annotations.Param; import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery; import java.util.List; import java.util.Map; @@ -16,5 +18,7 @@ import java.util.Map; */ public interface PdmBiPersoncorrdeviceMapper extends BaseMapper { - List queryAll(Map query); + List queryAll(@Param("query") DeviceUserQuery query); + + List queryAllDevice(@Param("query") DeviceUserQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml index 48fe08c2..8bf3506b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml @@ -3,6 +3,32 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dto/DeviceUserQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dto/DeviceUserQuery.java new file mode 100644 index 00000000..bb50fef4 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dto/DeviceUserQuery.java @@ -0,0 +1,27 @@ +package org.nl.wms.device_manage.service.userdevice.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.productmanage.service.iostorInv.dao.StIvtIostorinvCp; +import org.nl.wms.system_manage.service.user.dto.UserDto; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class DeviceUserQuery extends BaseQuery { + + private String username; + + private String user_id; + + @Override + public void paramMapping() { + super.doP.put("username", QParam.builder().k(new String[]{"username"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java index 0ed1305e..c6b08d3d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java @@ -2,11 +2,11 @@ package org.nl.wms.device_manage.service.userdevice.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.common.domain.query.PageQuery; import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; import org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdeviceMapper; import org.nl.wms.device_manage.service.userdevice.IPdmBiPersoncorrdeviceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery; import org.nl.wms.mps.service.dto.PersoncorrdeviceDto; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -26,9 +26,8 @@ import java.util.Map; public class PdmBiPersoncorrdeviceServiceImpl extends ServiceImpl implements IPdmBiPersoncorrdeviceService { @Override - public List queryAll(Map query) { - this.baseMapper.queryAll(query); - return null; + public List queryAll(DeviceUserQuery query) { + return this.baseMapper.queryAll(query); } @Override @@ -85,4 +84,9 @@ public class PdmBiPersoncorrdeviceServiceImpl extends ServiceImpl queryAllDevice(DeviceUserQuery query) { + return this.baseMapper.queryAllDevice(query); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java new file mode 100644 index 00000000..39e215d4 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java @@ -0,0 +1,120 @@ +package org.nl.wms.product_manage.controller.teamcorrPerson; + + +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import io.jsonwebtoken.lang.Assert; +import io.swagger.annotations.ApiOperation; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.wms.device_manage.service.userdevice.dao.PdmBiPersoncorrdevice; +import org.nl.wms.device_manage.service.userdevice.dto.DeviceUserQuery; +import org.nl.wms.product_manage.service.teamcorrPerson.IPdmBiTeamcorrpersonService; +import org.nl.wms.product_manage.service.teamcorrPerson.dao.PdmBiTeamcorrperson; +import org.nl.wms.product_manage.service.teamcorrPerson.dto.WorkTeamQuery; +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.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + *

+ * 班组与人员对应关系表 前端控制器 + *

+ * + * @author generator + * @since 2023-06-20 + */ +@RestController +@RequestMapping("/api/pdmBiTeamcorrperson") +public class PdmBiTeamcorrpersonController { + + @Autowired + private IPdmBiTeamcorrpersonService iPdmBiTeamcorrpersonService; + + @GetMapping + @Log("查询人员设备维护") + @ApiOperation("查询人员设备维护") + public ResponseEntity query(WorkTeamQuery query, PageQuery page){ + Page result = PageHelper.startPage(page.getPage() + 1, page.getSize()); + List list = iPdmBiTeamcorrpersonService.queryAll(query); + TableDataInfo build = TableDataInfo.build(list); + build.setTotalElements(result.getTotal()); + return new ResponseEntity<>(build, HttpStatus.OK); + } + + @GetMapping("/queryUser") + @Log("查询人员设备维护") + @ApiOperation("查询人员设备维护") + public ResponseEntity queryUser(WorkTeamQuery query, PageQuery page){ + Page result = PageHelper.startPage(page.getPage() + 1, page.getSize()); + List list = iPdmBiTeamcorrpersonService.queryUser(query); + TableDataInfo build = TableDataInfo.build(list); + build.setTotalElements(result.getTotal()); + return new ResponseEntity<>(build, HttpStatus.OK); + } + + + @PostMapping + @Log("新增班组对应人员") + @ApiOperation("新增班组对应人员") + public ResponseEntity create(@RequestBody JSONObject entity){ + Assert.notNull(entity,"请求参数不能为空"); + + PdmBiTeamcorrperson one = iPdmBiTeamcorrpersonService.getOne( + new QueryWrapper().lambda() + .eq(PdmBiTeamcorrperson::getUser_id, entity.getString("user_id")) + .eq(PdmBiTeamcorrperson::getTeam_id, entity.getString("team_id")) + ); + + if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("人员重复"); + + PdmBiTeamcorrperson pdmBiTeamcorrperson = entity.toJavaObject(PdmBiTeamcorrperson.class); + pdmBiTeamcorrperson.setTeam_person_id(IdUtil.getStringId()); + iPdmBiTeamcorrpersonService.save(pdmBiTeamcorrperson); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + + @PutMapping + @Log("修改班组对应人员") + @ApiOperation("修改班组对应人员") + public ResponseEntity update(@RequestBody JSONObject entity){ + + PdmBiTeamcorrperson one = iPdmBiTeamcorrpersonService.getOne( + new QueryWrapper().lambda() + .eq(PdmBiTeamcorrperson::getUser_id, entity.getString("user_id")) + .eq(PdmBiTeamcorrperson::getTeam_id, entity.getString("team_id")) + ); + + if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("人员重复"); + + PdmBiTeamcorrperson pdmBiTeamcorrperson = iPdmBiTeamcorrpersonService.getById(entity.getString("team_person_id")); + pdmBiTeamcorrperson.setUser_id(entity.getString("user_id")); + iPdmBiTeamcorrpersonService.updateById(pdmBiTeamcorrperson); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @Log("删除班组对应人员") + @ApiOperation("删除班组对应人员") + @DeleteMapping + public ResponseEntity delete(@RequestBody String[] ids) { + if (ids != null && ids.length>0){ + iPdmBiTeamcorrpersonService.removeByIds(Arrays.asList(ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls index aa248e2c..442ec9d8 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/IPdmBiTeamcorrpersonService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/IPdmBiTeamcorrpersonService.java new file mode 100644 index 00000000..ab37c72d --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/IPdmBiTeamcorrpersonService.java @@ -0,0 +1,23 @@ +package org.nl.wms.product_manage.service.teamcorrPerson; + +import org.nl.wms.product_manage.service.teamcorrPerson.dao.PdmBiTeamcorrperson; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.product_manage.service.teamcorrPerson.dto.WorkTeamQuery; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 班组与人员对应关系表 服务类 + *

+ * + * @author generator + * @since 2023-06-20 + */ +public interface IPdmBiTeamcorrpersonService extends IService { + + List queryAll(WorkTeamQuery query); + + List queryUser(WorkTeamQuery query); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/PdmBiTeamcorrperson.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/PdmBiTeamcorrperson.java new file mode 100644 index 00000000..538e3e96 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/PdmBiTeamcorrperson.java @@ -0,0 +1,41 @@ +package org.nl.wms.product_manage.service.teamcorrPerson.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * 班组与人员对应关系表 + *

+ * + * @author generator + * @since 2023-06-20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pdm_bi_teamcorrperson") +public class PdmBiTeamcorrperson implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 班组人员对应标识 + */ + @TableId + private String team_person_id; + + /** + * 班组标识 + */ + private String team_id; + + /** + * 操作工标识 + */ + private String user_id; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/mapper/PdmBiTeamcorrpersonMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/mapper/PdmBiTeamcorrpersonMapper.java new file mode 100644 index 00000000..65376f99 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/mapper/PdmBiTeamcorrpersonMapper.java @@ -0,0 +1,24 @@ +package org.nl.wms.product_manage.service.teamcorrPerson.dao.mapper; + +import org.apache.ibatis.annotations.Param; +import org.nl.wms.product_manage.service.teamcorrPerson.dao.PdmBiTeamcorrperson; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.product_manage.service.teamcorrPerson.dto.WorkTeamQuery; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 班组与人员对应关系表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-06-20 + */ +public interface PdmBiTeamcorrpersonMapper extends BaseMapper { + + List queryAll(@Param("query") WorkTeamQuery query); + + List queryUser(@Param("query") WorkTeamQuery query); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/mapper/xml/PdmBiTeamcorrpersonMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/mapper/xml/PdmBiTeamcorrpersonMapper.xml new file mode 100644 index 00000000..193931d5 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/mapper/xml/PdmBiTeamcorrpersonMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dto/WorkTeamQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dto/WorkTeamQuery.java new file mode 100644 index 00000000..30208d0a --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dto/WorkTeamQuery.java @@ -0,0 +1,27 @@ +package org.nl.wms.product_manage.service.teamcorrPerson.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.modules.common.base.BaseDTO; +import org.nl.wms.system_manage.service.user.dto.UserDto; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class WorkTeamQuery extends BaseQuery { + + private String team_code; + + private String team_id; + + @Override + public void paramMapping() { + super.doP.put("team_code", QParam.builder().k(new String[]{"team_code"}).type(QueryTEnum.LK).build()); + } + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/impl/PdmBiTeamcorrpersonServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/impl/PdmBiTeamcorrpersonServiceImpl.java new file mode 100644 index 00000000..37fb0560 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/impl/PdmBiTeamcorrpersonServiceImpl.java @@ -0,0 +1,33 @@ +package org.nl.wms.product_manage.service.teamcorrPerson.impl; + +import org.nl.wms.product_manage.service.teamcorrPerson.dao.PdmBiTeamcorrperson; +import org.nl.wms.product_manage.service.teamcorrPerson.dao.mapper.PdmBiTeamcorrpersonMapper; +import org.nl.wms.product_manage.service.teamcorrPerson.IPdmBiTeamcorrpersonService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.product_manage.service.teamcorrPerson.dto.WorkTeamQuery; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 班组与人员对应关系表 服务实现类 + *

+ * + * @author generator + * @since 2023-06-20 + */ +@Service +public class PdmBiTeamcorrpersonServiceImpl extends ServiceImpl implements IPdmBiTeamcorrpersonService { + + @Override + public List queryAll(WorkTeamQuery query) { + return this.baseMapper.queryAll(query); + } + + @Override + public List queryUser(WorkTeamQuery query) { + return this.baseMapper.queryUser(query); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java index 91f0a278..55e8f320 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java @@ -1,6 +1,16 @@ package org.nl.wms.quality_manage.controller.inspection; +import io.swagger.annotations.ApiOperation; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionitempointService; +import org.nl.wms.quality_manage.service.inspection.dto.ItemPointQuery; +import org.nl.wms.storage_manage.semimanage.service.check.dto.CheckQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -14,8 +24,17 @@ import org.springframework.web.bind.annotation.RestController; * @since 2023-05-06 */ @RestController -@RequestMapping("/qlTestInspectionitempoint") +@RequestMapping("/api/inspectionItemPoint") public class QlTestInspectionitempointController { + @Autowired + private IQlTestInspectionitempointService inspectionitempointService; + + @GetMapping + @Log("查询检测项点") + @ApiOperation("查询检测项点") + public ResponseEntity query(ItemPointQuery query, PageQuery page) { + return new ResponseEntity<>(inspectionitempointService.pageQuery(query, page), HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionitempointService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionitempointService.java index 5dd87234..b261c11c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionitempointService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionitempointService.java @@ -1,7 +1,9 @@ package org.nl.wms.quality_manage.service.inspection; -import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint; +import org.nl.wms.quality_manage.service.inspection.dto.ItemPointQuery; /** *

@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IQlTestInspectionitempointService extends IService { + Object pageQuery(ItemPointQuery query, PageQuery page); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dto/ItemPointQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dto/ItemPointQuery.java new file mode 100644 index 00000000..ae5c6cf9 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dto/ItemPointQuery.java @@ -0,0 +1,22 @@ +package org.nl.wms.quality_manage.service.inspection.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.quality_manage.service.inspection.dao.QlTestInspectionitempoint; +import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckmstBcp; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class ItemPointQuery extends BaseQuery { + + + private String inspection_item_type; + + private String inspection_type; + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionitempointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionitempointServiceImpl.java index 9bce1a28..9cff92f9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionitempointServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionitempointServiceImpl.java @@ -1,9 +1,15 @@ package org.nl.wms.quality_manage.service.inspection.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint; import org.nl.wms.quality_manage.service.inspection.dao.mapper.QlTestInspectionitempointMapper; import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionitempointService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.quality_manage.service.inspection.dto.ItemPointQuery; +import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckmstBcp; +import org.nl.wms.storage_manage.semimanage.service.check.dto.CheckQuery; import org.springframework.stereotype.Service; /** @@ -16,5 +22,11 @@ import org.springframework.stereotype.Service; */ @Service public class QlTestInspectionitempointServiceImpl extends ServiceImpl implements IQlTestInspectionitempointService { - + @Override + public Object pageQuery(ItemPointQuery query, PageQuery page) { + // 分页查询 + Page pageQuery = this.page(page.build(), query.build()); + TableDataInfo build = TableDataInfo.build(pageQuery); + return build; + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java index 551e3f50..a40bda7a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.storage_manage.productmanage.service.iostorInv.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -636,6 +637,12 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl result = bean.issueTaskToAcs3(param); + if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) { + throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message")); + } + // 2.更新任务状态 taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode()); iSchBaseTaskService.updateById(taskDao); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java index b2405974..9f5b8e98 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.storage_manage.productmanage.service.iostorInv.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -847,7 +848,12 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl result = bean.issueTaskToAcs3(param); + if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) { + throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message")); + } // 2.更新任务状态 taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java index 809b078c..85537f0b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.storage_manage.semimanage.service.iostorInv.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; @@ -316,6 +317,12 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl result = bean.issueTaskToAcs3(param); + if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) { + throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message")); + } + // 2.更新任务状态 taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode()); iSchBaseTaskService.updateById(taskDao); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java index d0752e33..88371be9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.wms.storage_manage.semimanage.service.iostorInv.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; @@ -350,10 +351,17 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl result = bean.issueTaskToAcs3(param); + if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) { + throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message")); + } + // 2.更新任务状态 taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode()); iSchBaseTaskService.updateById(taskDao); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java index a3d32e47..e76587a0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java @@ -105,7 +105,7 @@ public class SysDictController { // @SaCheckPermission("dict:edit") public ResponseEntity updateDetail(@RequestBody Dict resources){ dictService.updateDetail(resources); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); + return new ResponseEntity<>(HttpStatus.OK); } @Log("删除字典详情") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java index 9cd8e64b..f081be8c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java @@ -44,7 +44,7 @@ public class SysDictServiceImpl extends ServiceImpl impleme if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) blurry = whereJson.get("blurry").toString(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); QueryWrapper lam = new QueryWrapper<>(); - lam.select("MAX(dict_id) AS dictId, code, name") + lam.select("MAX(dict_id) AS dict_id, code, name") .lambda() .like(ObjectUtil.isNotEmpty(blurry), Dict::getCode, blurry) .or(ObjectUtil.isNotEmpty(blurry)) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java index 71683832..61a6806c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java @@ -1,5 +1,6 @@ package org.nl.wms.system_manage.service.param; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; @@ -25,7 +26,7 @@ public interface ISysParamService extends IService { * @param page 分页信息 * @return */ - Page queryPage(Map whereJson, PageQuery page); + IPage queryPage(Map whereJson, PageQuery page); /** * 创建参数 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java index d753598f..3fd35e2f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.system_manage.service.param.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; @@ -11,6 +12,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.MapOf; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; +import org.nl.wms.system_manage.service.dict.dao.Dict; import org.nl.wms.system_manage.service.param.ISysParamService; import org.nl.wms.system_manage.service.param.dao.Param; import org.nl.wms.system_manage.service.param.dao.mapper.SysParamMapper; @@ -38,11 +40,12 @@ public class SysParamServiceImpl extends ServiceImpl impl private final SysParamMapper paramMapper; @Override - public Page queryPage(Map whereJson, PageQuery page) { + public IPage queryPage(Map whereJson, PageQuery page) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.orderBy(true, true, "create_time"); - Page paramPage = paramMapper.selectPage(page.build(), queryWrapper); - return paramPage; + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + paramMapper.selectPage(pages, queryWrapper); + return pages; } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataPermission.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataPermission.java index bff1b710..c9bfbb72 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataPermission.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataPermission.java @@ -47,7 +47,7 @@ public class SysDataPermission implements Serializable { /** * 排序 */ - private BigDecimal orderSort; + private BigDecimal order_sort; /** * 备注 @@ -57,42 +57,42 @@ public class SysDataPermission implements Serializable { /** * 是否启用 */ - private String isUsed; + private String is_used; /** * 是否删除 */ - private String isDelete; + private String is_delete; /** * 创建人标识 */ - private String createId; + private String create_id; /** * 创建人 */ - private String createName; + private String create_name; /** * 创建时间 */ - private Date createTime; + private String create_time; /** * 修改人标识 */ - private String updateId; + private String update_id; /** * 修改人 */ - private String updateName; + private String update_name; /** * 修改时间 */ - private Date updateTime; + private String update_time; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/impl/SysDataPermissionServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/impl/SysDataPermissionServiceImpl.java index 607b3a42..ff1a49c3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/impl/SysDataPermissionServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/impl/SysDataPermissionServiceImpl.java @@ -1,5 +1,6 @@ package org.nl.wms.system_manage.service.permission.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; @@ -60,12 +61,12 @@ public class SysDataPermissionServiceImpl extends ServiceImpl \ No newline at end of file diff --git a/mes/qd/src/assets/icons/svg/质检单.svg b/mes/qd/src/assets/icons/svg/质检单.svg new file mode 100644 index 00000000..bcba1500 --- /dev/null +++ b/mes/qd/src/assets/icons/svg/质检单.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/mes/qd/src/views/system/dict/dictDetail.vue b/mes/qd/src/views/system/dict/dictDetail.vue index b99733d5..503b4519 100644 --- a/mes/qd/src/views/system/dict/dictDetail.vue +++ b/mes/qd/src/views/system/dict/dictDetail.vue @@ -38,7 +38,7 @@ - + @@ -106,7 +106,7 @@ import pagination from '@crud/Pagination' import rrOperation from '@crud/RR.operation' import udOperation from '@crud/UD.operation' -const defaultForm = { dictId: null, name: null, label: null, value: null, dictSort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null } +const defaultForm = { dict_id: null, name: null, label: null, value: null, dictSort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null } export default { components: { pagination, rrOperation, udOperation }, @@ -116,8 +116,8 @@ export default { title: '字典详情', url: 'api/dict/dictDetail', query: { code: '' }, - idField: 'dictId', - sort: ['dictSort,asc', 'dictId,desc'], + idField: 'dict_id', + sort: ['dict_sort,asc', 'dict_id,desc'], crudMethod: { ...crudDictDetail }, optShow: { add: true, @@ -133,11 +133,11 @@ export default { presenter(), header(), form(function() { - return Object.assign({ dict: { dictId: this.dictId }}, defaultForm) + return Object.assign({ dict: { dict_id: this.dict_id }}, defaultForm) })], data() { return { - dictId: null, + dict_id: null, rules: { label: [ { required: true, message: '请输入字典标签', trigger: 'blur' } diff --git a/mes/qd/src/views/system/menu/index.vue b/mes/qd/src/views/system/menu/index.vue index 1b5f79ff..da7d33af 100644 --- a/mes/qd/src/views/system/menu/index.vue +++ b/mes/qd/src/views/system/menu/index.vue @@ -101,9 +101,9 @@ - + - + @@ -221,7 +221,7 @@ import Dict from '../../../components/Dict/Dict' const defaultForm = { menu_id: null, title: null, - menuSort: 999, + menu_sort: 999, path: null, systemType: null, category: null, diff --git a/mes/qd/src/views/system/user/index.vue b/mes/qd/src/views/system/user/index.vue index b6b2094d..33052f40 100644 --- a/mes/qd/src/views/system/user/index.vue +++ b/mes/qd/src/views/system/user/index.vue @@ -122,9 +122,9 @@ @@ -214,7 +214,7 @@ :data="deptsDatas" :default-checked-keys="depChecked" :props="deptProps" - node-key="dept_ud" + node-key="dept_id" highlight-current check-strictly @check="handCheck" @@ -348,7 +348,7 @@ export default { name: 'User', components: { RelevanceDeptDialog, RelevanceUserDialog, Treeselect, crudOperation, rrOperation, udOperation, pagination }, cruds() { - return CRUD({ title: '用户', idField: 'userId', url: 'api/users', crudMethod: { ...crudUser }}) + return CRUD({ title: '用户', idField: 'user_id', url: 'api/users', crudMethod: { ...crudUser }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], // 数据字典 @@ -445,6 +445,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { + debugger this.crud.delAllLoading = true this.crud.doDelete(datas) }).catch(() => { @@ -453,10 +454,10 @@ export default { // 新增与编辑前做的操作 [CRUD.HOOK.afterToCU](crud, form) { this.getRoles() - if (form.dept_ud == null) { + if (form.dept_id == null) { crudDept.getDepts() } else { - this.getSupDepts(form.dept_ud) + this.getSupDepts(form.dept_id) } // this.getRoleLevel() 暂时不用 form.is_used = form.enabled.toString() @@ -541,8 +542,8 @@ export default { }) }) }, - getSupDepts(dept_ud) { - crudDept.getDeptSuperior(dept_ud).then(res => { + getSupDepts(dept_id) { + crudDept.getDeptSuperior(dept_id).then(res => { console.log('父部门', res) const date = res.content this.buildDepts(date) @@ -575,17 +576,18 @@ export default { }, normalizer(node) { return { - id: node.dept_ud, + id: node.dept_id, label: node.name, children: node.children } }, // 切换部门 handleNodeClick(data) { - this.query.dept_ud = data.dept_ud + debugger + this.query.dept_id = data.dept_id this.query.needAll = true this.crud.toQuery() - this.query.dept_ud = null + this.query.dept_id = null }, // 改变状态 changeEnabled(row) { @@ -660,7 +662,7 @@ export default { this.$nextTick(function() { for (let j = 0; j < row.roles.length; j++) { for (let i = 0; i < this.rolesDatas.length; i++) { - if (this.rolesDatas[i].roleId == row.roles[j].roleId) { + if (this.rolesDatas[i].role_id === row.roles[j].role_id) { this.$refs.roleTable.toggleRowSelection(this.rolesDatas[i], true) break } @@ -686,11 +688,11 @@ export default { this.permissions = res this.dataDialog.person_name = row.person_name this.dataDialog.username = row.username - this.dataDialog.userId = row.userId + this.dataDialog.user_id = row.user_id this.dataPermissionTitle = '[' + row.person_name + '] 数据权限' this.dataPerm = true // 回显数据 - crudDataPermission.getDataShow(row.userId).then(res => { + crudDataPermission.getDataShow(row.user_id).then(res => { this.$nextTick(function() { for (var index = 0; index < res.length; index++) { for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) { @@ -733,7 +735,7 @@ export default { this.relevanceDept = true } else if (row.permissionId == '1605128919449735168') { // 自身 const param = { - userId: this.dataDialog.userId + user_id: this.dataDialog.user_id } this.dataDialog.dataScopeType[index].users = [] this.dataDialog.dataScopeType[index].users.push(param) @@ -767,7 +769,7 @@ export default { }, savePermise() { const param = { - userId: this.dataDialog.userId, + user_id: this.dataDialog.user_id, datas: this.multipleSelection } console.log('param', param) @@ -783,7 +785,7 @@ export default { this.depChecked = [] }, giveValue(row) { - this.depCheckedId = row.userId + this.depCheckedId = row.user_id }, clearCheck() { // 清空选中 if (this.flag) this.$refs.deptUser.setCheckedKeys([]) @@ -801,12 +803,12 @@ export default { }, saveChecked() { const user = { - userId: this.depCheckedId + user_id: this.depCheckedId } if (this.flag) { user.deptIds = this.$refs.deptUser.getCheckedKeys() } else { - user.rolesIds = this.crud.selections.map(item => (item.roleId)) + user.rolesIds = this.crud.selections.map(item => (item.role_id)) } crudUser.edit(user).then(res => { this.cancelForm() @@ -860,7 +862,7 @@ export default { }, showDatas(row) { const param = { - userId: this.dataDialog.userId, + user_id: this.dataDialog.user_id, permissionScopeType: row.value } crudDataPermission.getDataDetail(param).then(res => { diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/inspectionItemPoint/index.vue b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionItemPoint/index.vue new file mode 100644 index 00000000..c60fcac6 --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionItemPoint/index.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/inspectionItemPoint/inspectionItemPoint.js b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionItemPoint/inspectionItemPoint.js new file mode 100644 index 00000000..e11a4cd1 --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionItemPoint/inspectionItemPoint.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/inspectionItemPoint', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/inspectionItemPoint', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/inspectionItemPoint', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/ItemDialog.vue b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/ItemDialog.vue new file mode 100644 index 00000000..c003b894 --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/ItemDialog.vue @@ -0,0 +1,158 @@ + + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/MaintenanceDialog.vue b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/MaintenanceDialog.vue new file mode 100644 index 00000000..9ec00dc8 --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/MaintenanceDialog.vue @@ -0,0 +1,207 @@ + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/ViewDialog.vue b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/ViewDialog.vue new file mode 100644 index 00000000..a542a49e --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/ViewDialog.vue @@ -0,0 +1,136 @@ + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/index.vue b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/index.vue new file mode 100644 index 00000000..581b33bb --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/index.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/inspectionSchemeMst.js b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/inspectionSchemeMst.js new file mode 100644 index 00000000..7f2530c0 --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionSchemeMst/inspectionSchemeMst.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/inspectionSchemeMst', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/inspectionSchemeMst/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/inspectionSchemeMst', + method: 'put', + data + }) +} + +export function saveInspectionSchemeDtl(data) { + return request({ + url: 'api/inspectionSchemeMst/saveInspectionSchemeDtl', + method: 'post', + data + }) +} + +export function getInspectionSchemeDtl(data) { + return request({ + url: 'api/inspectionSchemeMst/getInspectionSchemeDtl', + method: 'post', + data + }) +} + +export function selectList() { + return request({ + url: 'api/inspectionSchemeMst/selectList' + }) +} + +export default { add, edit, del, saveInspectionSchemeDtl, getInspectionSchemeDtl, selectList } diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/productStandard/AddDialog.vue b/mes/qd/src/views/wms/masterdata_manage/ql/productStandard/AddDialog.vue new file mode 100644 index 00000000..18f4f82b --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/ql/productStandard/AddDialog.vue @@ -0,0 +1,320 @@ + + + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/productStandard/index.vue b/mes/qd/src/views/wms/masterdata_manage/ql/productStandard/index.vue new file mode 100644 index 00000000..0112a110 --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/ql/productStandard/index.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/productStandard/productStandard.js b/mes/qd/src/views/wms/masterdata_manage/ql/productStandard/productStandard.js new file mode 100644 index 00000000..9b24a3fb --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/ql/productStandard/productStandard.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/productStandard', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/productStandard/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/productStandard', + method: 'put', + data + }) +} +export function saveData(data) { + return request({ + url: 'api/productStandard/saveData', + method: 'post', + data + }) +} +export function copyAdd(data) { + return request({ + url: 'api/productStandard/copyAdd', + method: 'post', + data + }) +} + +export function getInspectionSchemeDtl(data) { + return request({ + url: 'api/productStandard/getInspectionSchemeDtl', + method: 'post', + data + }) +} + +export default { add, edit, del, saveData, copyAdd,getInspectionSchemeDtl } diff --git a/mes/qd/src/views/wms/mps/personcorrdevice/DevicesDialog.vue b/mes/qd/src/views/wms/mps/personcorrdevice/DevicesDialog.vue deleted file mode 100644 index b2e9e2fb..00000000 --- a/mes/qd/src/views/wms/mps/personcorrdevice/DevicesDialog.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - - - diff --git a/mes/qd/src/views/wms/mps/personcorrdevice/SelectDeviceDialog.vue b/mes/qd/src/views/wms/mps/personcorrdevice/SelectDeviceDialog.vue index 19e06b25..869e53a8 100644 --- a/mes/qd/src/views/wms/mps/personcorrdevice/SelectDeviceDialog.vue +++ b/mes/qd/src/views/wms/mps/personcorrdevice/SelectDeviceDialog.vue @@ -18,15 +18,6 @@ style="width: 220px;" class="filter-item" /> - - - - @@ -40,25 +31,20 @@ :cell-style="{'text-align':'center'}" :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}" @selection-change="crud.selectionChangeHandler" + @current-change="clickChange" > - + + + - - 取 消 + 取 消 确 定 @@ -70,34 +56,25 @@ import CRUD, { header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' import '@riophae/vue-treeselect/dist/vue-treeselect.css' -import crudTeamcorrperson from '@/api/wms/mps/teamcorrperson' -import crudPersoncorrdevice from '@/api/wms/mps/personcorrdevice' import crudDevice from '@/api/wms/pdm/device' export default { name: 'SelectDeviceDialog', components: { rrOperation, pagination }, cruds() { - return CRUD({ title: '设备选择', url: 'api/device', crudMethod: { ...crudTeamcorrperson }, optShow: {}}) + return CRUD({ title: '设备选择', url: 'api/device', crudMethod: { ...crudDevice }, optShow: {}}) }, mixins: [presenter(), header()], props: { dialogShow: { type: Boolean, default: false - }, - materOptCode: { - type: String, - default: '00' } }, data() { return { - dialogVisible: false, - user_id: '', - tableData: [], - workList: [], - tableLabel: [] + tableRadio: null, + dialogVisible: false } }, watch: { @@ -109,72 +86,32 @@ export default { }, methods: { open() { - this.getWorkprocedure() - this.getDeviceIdByUserId(this.user_id) }, setForm(user_id) { this.user_id = user_id }, // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.afterRefresh]() { - const that = this - that.$nextTick(() => { - that.crud.data.forEach(row => { - this.tableData.forEach(person => { - if (Number(row.device_id) === Number(person.device_id)) { - that.$refs.table.toggleRowSelection(row, true) - } - }) - }) - }) return true }, close() { - this.crud.resetQuery(false) - this.$emit('update:dialogShow', false) - }, - closeDia() { - this.crud.resetQuery(true) this.$emit('update:dialogShow', false) }, submit() { - if (this.crud.selections.length <= 0) { + if (this.tableRadio === null) { this.$message('至少选择一条设备信息') return } console.log(this.crud.selections) - crudPersoncorrdevice.addDevices({ user_id: this.user_id, devices: this.crud.selections }).then(res => { - this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - // 隐藏弹出框 - this.$emit('update:dialogShow', false) - this.crud.toQuery() - // 向父组件传值 - this.$emit('tableChanged3', this.tableRadio) - }) + this.$emit('update:dialogShow', false) + this.$emit('tableChanged3', this.tableRadio) }, - changeHeader(search, workprocedure_id) { - this.getHeader(search,workprocedure_id) - this.crud.toQuery() + clickChange(item) { + this.tableRadio = item }, // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { - this.getHeader(this.query.search, this.query.workprocedure_id) return true - }, - getWorkprocedure() { - crudDevice.getWorkprocedure().then(res => { - this.workList = res - }) - }, - getHeader(search, workprocedure_id) { - crudDevice.getItemByDeviceId({ search: search, workprocedure_id: workprocedure_id }).then(res => { - this.tableLabel = res.newArray - }) - }, - getDeviceIdByUserId(user_id) { - crudPersoncorrdevice.getDeviceIdByUserId({ user_id: user_id }).then(res => { - this.tableData = res - }) } } } diff --git a/mes/qd/src/views/wms/mps/personcorrdevice/SelectPeersonDialog.vue b/mes/qd/src/views/wms/mps/personcorrdevice/SelectPeersonDialog.vue deleted file mode 100644 index aba43b88..00000000 --- a/mes/qd/src/views/wms/mps/personcorrdevice/SelectPeersonDialog.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - diff --git a/mes/qd/src/views/wms/mps/personcorrdevice/dictDetail.vue b/mes/qd/src/views/wms/mps/personcorrdevice/dictDetail.vue new file mode 100644 index 00000000..f2a8ad0b --- /dev/null +++ b/mes/qd/src/views/wms/mps/personcorrdevice/dictDetail.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/mes/qd/src/views/wms/mps/personcorrdevice/index.vue b/mes/qd/src/views/wms/mps/personcorrdevice/index.vue index 69d22c2c..00bc3787 100644 --- a/mes/qd/src/views/wms/mps/personcorrdevice/index.vue +++ b/mes/qd/src/views/wms/mps/personcorrdevice/index.vue @@ -1,14 +1,14 @@ diff --git a/mes/qd/src/views/wms/mps/teamcorrperson/PersonDialog.vue b/mes/qd/src/views/wms/mps/teamcorrperson/PersonDialog.vue deleted file mode 100644 index 9c423b3b..00000000 --- a/mes/qd/src/views/wms/mps/teamcorrperson/PersonDialog.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - - - diff --git a/mes/qd/src/views/wms/mps/teamcorrperson/SelectDeviceDialog.vue b/mes/qd/src/views/wms/mps/teamcorrperson/SelectDeviceDialog.vue new file mode 100644 index 00000000..c96af7b6 --- /dev/null +++ b/mes/qd/src/views/wms/mps/teamcorrperson/SelectDeviceDialog.vue @@ -0,0 +1,128 @@ + + + + + diff --git a/mes/qd/src/views/wms/mps/teamcorrperson/SelectPeersonDialog.vue b/mes/qd/src/views/wms/mps/teamcorrperson/SelectPeersonDialog.vue deleted file mode 100644 index f27099c9..00000000 --- a/mes/qd/src/views/wms/mps/teamcorrperson/SelectPeersonDialog.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - - diff --git a/mes/qd/src/views/wms/mps/teamcorrperson/dictDetail.vue b/mes/qd/src/views/wms/mps/teamcorrperson/dictDetail.vue new file mode 100644 index 00000000..037dbd58 --- /dev/null +++ b/mes/qd/src/views/wms/mps/teamcorrperson/dictDetail.vue @@ -0,0 +1,157 @@ + + + + + diff --git a/mes/qd/src/views/wms/mps/teamcorrperson/index.vue b/mes/qd/src/views/wms/mps/teamcorrperson/index.vue index c1f754bd..a15c595c 100644 --- a/mes/qd/src/views/wms/mps/teamcorrperson/index.vue +++ b/mes/qd/src/views/wms/mps/teamcorrperson/index.vue @@ -1,208 +1,133 @@ diff --git a/mes/qd/src/views/wms/mps/teamcorrperson/teamcorrperson.js b/mes/qd/src/views/wms/mps/teamcorrperson/teamcorrperson.js new file mode 100644 index 00000000..afe615ce --- /dev/null +++ b/mes/qd/src/views/wms/mps/teamcorrperson/teamcorrperson.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/pdmBiTeamcorrperson', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/pdmBiTeamcorrperson/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/pdmBiTeamcorrperson', + method: 'put', + data + }) +} + +export default { add, edit, del }