root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-06-20 13:46:38 +08:00
parent d8dbcd1a1f b810cf6399
commit 4612ce74f5
56 changed files with 2907 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java
View File

@@ -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<Object> query(@RequestParam Map query, PageQuery page){
public ResponseEntity<Object> query(DeviceUserQuery query, PageQuery page){
Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
List<Map> 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<Object> device(DeviceUserQuery query, PageQuery page){
Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
List<Map> 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<Object> create(@RequestBody JSONObject entity){
Assert.notNull(entity,"请求参数不能为空");
PdmBiPersoncorrdevice one = pdmBiPersoncorrdeviceService.getOne(
new QueryWrapper<PdmBiPersoncorrdevice>().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<Object> update(@RequestBody JSONObject entity){
PdmBiPersoncorrdevice one = pdmBiPersoncorrdeviceService.getOne(
new QueryWrapper<PdmBiPersoncorrdevice>().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<Object> delete(@RequestBody Long[] ids) {
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
if (ids != null && ids.length>0){
pdmBiPersoncorrdeviceService.removeByIds(Arrays.asList(ids));
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/IPdmBiPersoncorrdeviceService.java
View File

@@ -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<PdmBiPersoncorrd
* @param whereJson 条件
* @return Map<String,Object>
*/
List<Map> queryAll(Map whereJson);
List<Map> queryAll(DeviceUserQuery whereJson);
/**
@@ -80,4 +80,6 @@ public interface IPdmBiPersoncorrdeviceService extends IService<PdmBiPersoncorrd
void addDevices(JSONObject param);
void deleteRow(JSONObject param);
List<Map> queryAllDevice(DeviceUserQuery whereJson);
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/PdmBiPersoncorrdevice.java
View File

@@ -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
*/

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/PdmBiPersoncorrdeviceMapper.java
View File

@@ -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<PdmBiPersoncorrdevice> {
List<Map> queryAll(Map query);
List<Map> queryAll(@Param("query") DeviceUserQuery query);
List<Map> queryAllDevice(@Param("query") DeviceUserQuery query);
}

26
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dao/mapper/xml/PdmBiPersoncorrdeviceMapper.xml
View File

@@ -3,6 +3,32 @@
<mapper namespace="org.nl.wms.device_manage.service.userdevice.dao.mapper.PdmBiPersoncorrdeviceMapper">
<select id="queryAll" resultType="java.util.Map">
SELECT
*
FROM
sys_user
<where>
is_used = '1'
<if test="query.username != null and query.username != ''">
and username = #{query.username}
</if>
</where>
</select>
<select id="queryAllDevice" resultType="java.util.Map">
SELECT
device.device_code,
device.device_name,
use1.person_name,
mps.person_id
FROM
mps_personcorrdevice mps
LEFT JOIN pdm_bi_device device ON device.device_code = mps.device_code
LEFT JOIN sys_user use1 ON use1.user_id = mps.user_id
<where>
mps.user_id = #{query.user_id}
</where>
</select>
</mapper>

27
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/dto/DeviceUserQuery.java Normal file
View File

@@ -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<UserDto> {
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());
}
}

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/service/userdevice/impl/PdmBiPersoncorrdeviceServiceImpl.java
View File

@@ -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<PdmBiPersoncorrdeviceMapper, PdmBiPersoncorrdevice> implements IPdmBiPersoncorrdeviceService {
@Override
public List<Map> queryAll(Map query) {
this.baseMapper.queryAll(query);
return null;
public List<Map> queryAll(DeviceUserQuery query) {
return this.baseMapper.queryAll(query);
}
@Override
@@ -85,4 +84,9 @@ public class PdmBiPersoncorrdeviceServiceImpl extends ServiceImpl<PdmBiPersoncor
public void deleteRow(JSONObject param) {
}
@Override
public List<Map> queryAllDevice(DeviceUserQuery query) {
return this.baseMapper.queryAllDevice(query);
}
}

120
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java Normal file
View File

@@ -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;
/**
* <p>
* 班组与人员对应关系表 前端控制器
* </p>
*
* @author generator
* @since 2023-06-20
*/
@RestController
@RequestMapping("/api/pdmBiTeamcorrperson")
public class PdmBiTeamcorrpersonController {
@Autowired
private IPdmBiTeamcorrpersonService iPdmBiTeamcorrpersonService;
@GetMapping
@Log("查询人员设备维护")
@ApiOperation("查询人员设备维护")
public ResponseEntity<Object> query(WorkTeamQuery query, PageQuery page){
Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
List<Map> 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<Object> queryUser(WorkTeamQuery query, PageQuery page){
Page<Object> result = PageHelper.startPage(page.getPage() + 1, page.getSize());
List<Map> list = iPdmBiTeamcorrpersonService.queryUser(query);
TableDataInfo build = TableDataInfo.build(list);
build.setTotalElements(result.getTotal());
return new ResponseEntity<>(build, HttpStatus.OK);
}
@PostMapping
@Log("新增班组对应人员")
@ApiOperation("新增班组对应人员")
public ResponseEntity<Object> create(@RequestBody JSONObject entity){
Assert.notNull(entity,"请求参数不能为空");
PdmBiTeamcorrperson one = iPdmBiTeamcorrpersonService.getOne(
new QueryWrapper<PdmBiTeamcorrperson>().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<Object> update(@RequestBody JSONObject entity){
PdmBiTeamcorrperson one = iPdmBiTeamcorrpersonService.getOne(
new QueryWrapper<PdmBiTeamcorrperson>().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<Object> delete(@RequestBody String[] ids) {
if (ids != null && ids.length>0){
iPdmBiTeamcorrpersonService.removeByIds(Arrays.asList(ids));
}
return new ResponseEntity<>(HttpStatus.OK);
}
}

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls
View File

Binary file not shown.

23
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/IPdmBiTeamcorrpersonService.java Normal file
View File

@@ -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;
/**
* <p>
* 班组与人员对应关系表 服务类
* </p>
*
* @author generator
* @since 2023-06-20
*/
public interface IPdmBiTeamcorrpersonService extends IService<PdmBiTeamcorrperson> {
List<Map> queryAll(WorkTeamQuery query);
List<Map> queryUser(WorkTeamQuery query);
}

41
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/PdmBiTeamcorrperson.java Normal file
View File

@@ -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;
/**
* <p>
* 班组与人员对应关系表
* </p>
*
* @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;
}

24
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/mapper/PdmBiTeamcorrpersonMapper.java Normal file
View File

@@ -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;
/**
* <p>
* 班组与人员对应关系表 Mapper 接口
* </p>
*
* @author generator
* @since 2023-06-20
*/
public interface PdmBiTeamcorrpersonMapper extends BaseMapper<PdmBiTeamcorrperson> {
List<Map> queryAll(@Param("query") WorkTeamQuery query);
List<Map> queryUser(@Param("query") WorkTeamQuery query);
}

34
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dao/mapper/xml/PdmBiTeamcorrpersonMapper.xml Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.product_manage.service.teamcorrPerson.dao.mapper.PdmBiTeamcorrpersonMapper">
<select id="queryAll" resultType="java.util.Map">
SELECT
*
FROM
PDM_BI_WorkTeam
<where>
is_delete = '0'
<if test="query.team_code != null and query.team_code != ''">
and (team_code like #{query.team_code} or
team_name like #{query.team_code})
</if>
</where>
</select>
<select id="queryUser" resultType="java.util.Map">
SELECT
u.*,
person.team_person_id
FROM
pdm_bi_teamcorrperson person
LEFT JOIN sys_user u ON u.user_id = person.user_id
<where>
person.team_id = #{query.team_id}
</where>
</select>
</mapper>

27
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/dto/WorkTeamQuery.java Normal file
View File

@@ -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<BaseDTO> {
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());
}
}

33
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/teamcorrPerson/impl/PdmBiTeamcorrpersonServiceImpl.java Normal file
View File

@@ -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;
/**
* <p>
* 班组与人员对应关系表 服务实现类
* </p>
*
* @author generator
* @since 2023-06-20
*/
@Service
public class PdmBiTeamcorrpersonServiceImpl extends ServiceImpl<PdmBiTeamcorrpersonMapper, PdmBiTeamcorrperson> implements IPdmBiTeamcorrpersonService {
@Override
public List<Map> queryAll(WorkTeamQuery query) {
return this.baseMapper.queryAll(query);
}
@Override
public List<Map> queryUser(WorkTeamQuery query) {
return this.baseMapper.queryUser(query);
}
}

21
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java
View File

@@ -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<Object> query(ItemPointQuery query, PageQuery page) {
return new ResponseEntity<>(inspectionitempointService.pageQuery(query, page), HttpStatus.OK);
}
}

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionitempointService.java
View File

@@ -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;
/**
* <p>
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IQlTestInspectionitempointService extends IService<QlTestInspectionitempoint> {
Object pageQuery(ItemPointQuery query, PageQuery page);
}

22
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dto/ItemPointQuery.java Normal file
View File

@@ -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<QlTestInspectionitempoint> {
private String inspection_item_type;
private String inspection_type;
}

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionitempointServiceImpl.java
View File

@@ -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<QlTestInspectionitempointMapper, QlTestInspectionitempoint> implements IQlTestInspectionitempointService {
@Override
public Object pageQuery(ItemPointQuery query, PageQuery page) {
// 分页查询
Page<QlTestInspectionitempoint> pageQuery = this.page(page.build(), query.build());
TableDataInfo<QlTestInspectionitempoint> build = TableDataInfo.build(pageQuery);
return build;
}
}

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
View File

@@ -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<StIvtIostorinvCp
WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
bean.issueTaskToAcs3(param);
// 反馈失败报错
Map<String, Object> 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);

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
View File

@@ -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<StIvtIostorinvCpMap
param.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao)));
// 1.下发任务
WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
bean.issueTaskToAcs3(param);
// 反馈失败报错
Map<String, Object> 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());

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java
View File

@@ -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<StIvtIostorinvB
WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
bean.issueTaskToAcs3(param);
// 反馈失败报错
Map<String, Object> 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);

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java
View File

@@ -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<StIvtIostorinvBcpM
SchBaseTask taskDao = iSchBaseTaskService.getById(task_id);
JSONArray param = new JSONArray();
param.add(JSON.parseObject(JSONUtil.toJsonStr(taskDao)));
// 1.下发任务
WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class);
bean.issueTaskToAcs3(param);
// 反馈失败报错
Map<String, Object> 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);

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
View File

@@ -105,7 +105,7 @@ public class SysDictController {
// @SaCheckPermission("dict:edit")
public ResponseEntity<Object> updateDetail(@RequestBody Dict resources){
dictService.updateDetail(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
return new ResponseEntity<>(HttpStatus.OK);
}
@Log("删除字典详情")

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java
View File

@@ -44,7 +44,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) blurry = whereJson.get("blurry").toString();
IPage<Dict> pages = new Page<>(page.getPage() + 1, page.getSize());
QueryWrapper<Dict> 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))

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java
View File

@@ -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> {
* @param page 分页信息
* @return
*/
Page<Param> queryPage(Map whereJson, PageQuery page);
IPage<Param> queryPage(Map whereJson, PageQuery page);
/**
* 创建参数

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java
View File

@@ -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<SysParamMapper, Param> impl
private final SysParamMapper paramMapper;
@Override
public Page<Param> queryPage(Map whereJson, PageQuery page) {
public IPage<Param> queryPage(Map whereJson, PageQuery page) {
QueryWrapper<Param> queryWrapper = new QueryWrapper<>();
queryWrapper.orderBy(true, true, "create_time");
Page<Param> paramPage = paramMapper.selectPage(page.build(), queryWrapper);
return paramPage;
IPage<Param> pages = new Page<>(page.getPage() + 1, page.getSize());
paramMapper.selectPage(pages, queryWrapper);
return pages;
}
@Override

18
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataPermission.java
View File

@@ -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;
}

19
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/impl/SysDataPermissionServiceImpl.java
View File

@@ -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<SysDataPermissionM
permission.setPermissionId(IdUtil.getSnowflake(1, 1).nextIdStr());
permission.setCreateId(currentUserId);
permission.setCreateName(nickName);
permission.setUpdateId(currentUserId);
permission.setUpdateName(nickName);
permission.setUpdateTime(new Date());
permission.setCreateTime(new Date());
permission.setCreate_id(currentUserId);
permission.setCreate_name(nickName);
permission.setUpdate_id(currentUserId);
permission.setUpdate_name(nickName);
permission.setUpdate_time(DateUtil.now());
permission.setCreate_time(DateUtil.now());
dataPermissionMapper.insert(permission);
}
@@ -74,9 +75,9 @@ public class SysDataPermissionServiceImpl extends ServiceImpl<SysDataPermissionM
public void update(SysDataPermission permission) {
SysDataPermission dataPermission = dataPermissionMapper.selectById(permission.getPermissionId());
if (ObjectUtil.isEmpty(dataPermission)) throw new BadRequestException("被删除或无权限，操作失败!");
permission.setUpdateTime(new Date());
permission.setUpdateId(SecurityUtils.getCurrentUserId());
permission.setUpdateName(SecurityUtils.getCurrentNickName());
permission.setUpdate_time(DateUtil.now());
permission.setUpdate_id(SecurityUtils.getCurrentUserId());
permission.setUpdate_name(SecurityUtils.getCurrentNickName());
dataPermissionMapper.updateById(permission);
}