UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 设备登记、设备入库

Browse Source
dev_fifo1.0
chenhc 2 years ago
parent 944eb77b92
commit c6bdd36a42
8 changed files with 121 additions and 22 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java
Unescape Escape View File

@ -17,10 +17,7 @@ import com.glxp.api.entity.dev.DeviceInfoEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.exception.JsonException;
import com.glxp.api.req.dev.DeviceInfoDetailQuery;
import com.glxp.api.req.dev.DeviceInfoQuery;
import com.glxp.api.req.dev.FilterDeptDeviceRequest;
import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest;
import com.glxp.api.req.dev.*;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.dev.DeptDeviceDetailResponse;
import com.glxp.api.service.dev.DeviceChangeLogService;
@ -152,8 +149,7 @@ public class DeviceInfoController extends BaseController {
*/
@AuthRuleAnnotation("")
@PostMapping("/udi/device/info/detailByDeptCode/page")
public BaseResponse detailByDeptCode(@RequestBody @Valid DeviceInfoDetailQuery query) {
AuthAdmin user = super.getUser();
public BaseResponse detailByDeptCode(@RequestBody @Valid DeviceInfoDetailByDeptCodeQuery query) {
List<DeviceInfoVo> list = deviceInfoService.detail(query);
PageInfo pageInfo = new PageInfo<>(list);
PageSimpleResponse page = new PageSimpleResponse();

3
src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.api.dao.dev;
import com.glxp.api.entity.dev.DeviceInfoEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.enums.dev.DeviceStatusEnum;
import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery;
import com.glxp.api.req.dev.DeviceInfoDetailQuery;
import com.glxp.api.req.dev.DeviceInfoQuery;
import com.glxp.api.vo.dev.DeviceInfoVo;
@ -22,6 +23,8 @@ public interface DeviceInfoMapper extends BaseMapper<DeviceInfoEntity> {
List<DeviceInfoVo> detail(@Param("param") DeviceInfoDetailQuery query);
List<DeviceInfoVo> detail(@Param("param") DeviceInfoDetailByDeptCodeQuery query);
List<DeviceInfoVo> listVoByProductIdAndStatus(@Param("productId")Long productId, @Param("status")DeviceStatusEnum status);
List<DeviceInfoVo> listVoByCodes(@Param("list") List<String> deviceCodes,@Param("deptCode") String deptCode,@Param("status") DeviceStatusEnum status);

62
src/main/java/com/glxp/api/req/dev/DeviceInfoDetailByDeptCodeQuery.java
Unescape Escape View File

@ -0,0 +1,62 @@
package com.glxp.api.req.dev;
import com.glxp.api.enums.dev.DeviceStatusEnum;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
public class DeviceInfoDetailByDeptCodeQuery extends ListPageRequest {
/**
* 部门编码
*/
@NotBlank(message = "缺少部门编码")
private String deptCode;
/**
* 设备状态
*/
private DeviceStatusEnum status;
/**
* 设备编码
*/
private String deviceCode;
/**
* 最小销售标识
*/
private String nameCode;
/**
* 设备名称
*/
private String productName;
/**
* 生产企业
*/
private String manufactory;
/**
* 注册/备案号
*/
private String zczbhhzbapzbh;
private String productId;
private Boolean checkLock;
/**
* 计划id
*/
private Long planId;
/**
* 模版ID
*/
private Integer labelId;
}

17
src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java
Unescape Escape View File

@ -51,4 +51,21 @@ public class DeviceInfoDetailQuery extends ListPageRequest {
private Integer labelId;
/**
* 最小销售标识
*/
private String nameCode;
/**
* 生产企业
*/
private String manufactory;
/**
* 注册/备案号
*/
private String zczbhhzbapzbh;
}

3
src/main/java/com/glxp/api/service/dev/DeviceInfoService.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.dev.DeviceInfoEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.enums.dev.DeviceStatusEnum;
import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery;
import com.glxp.api.req.dev.DeviceInfoDetailQuery;
import com.glxp.api.req.dev.DeviceInfoQuery;
import com.glxp.api.vo.dev.DeviceInfoVo;
@ -91,6 +92,8 @@ public interface DeviceInfoService extends IService<DeviceInfoEntity> {
List<DeviceInfoVo> detail(DeviceInfoDetailQuery query);
List<DeviceInfoVo> detail(DeviceInfoDetailByDeptCodeQuery query);
List<DeviceInfoVo> listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status);
List<DeviceInfoVo> listVoByCodes(List<String> deviceCodes, String deptCode, DeviceStatusEnum status);

9
src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.dev.DeviceInfoEntity;
import com.glxp.api.enums.dev.DeviceStatusEnum;
import com.glxp.api.exception.JsonException;
import com.glxp.api.req.dev.DeviceInfoDetailByDeptCodeQuery;
import com.glxp.api.req.dev.DeviceInfoDetailQuery;
import com.glxp.api.req.dev.DeviceInfoQuery;
import com.glxp.api.service.dev.DeviceInfoService;
@ -158,6 +159,14 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
return super.baseMapper.detail(query);
}
@Override
public List<DeviceInfoVo> detail(DeviceInfoDetailByDeptCodeQuery query) {
if (query.getPage() != null) {
PageHelper.startPage(query.getPage(), query.getLimit());
}
return super.baseMapper.detail(query);
}
@Override
public List<DeviceInfoVo> listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status) {

32
src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml
Unescape Escape View File

@ -63,8 +63,8 @@
</select>
<select id="detailByUser" resultType="com.glxp.api.entity.dev.DeviceChangeOrderItemEntity">
<choose>
<when test="param.type==@com.glxp.api.enums.dev.DeviceChangeTypeEnum@ADD">
<!-- <choose>-->
<!-- <when test="param.type==@com.glxp.api.enums.dev.DeviceChangeTypeEnum@ADD">-->
select oi.* from device_change_order_item oi
inner join device_change_order o on o.orderId = oi.orderId
<where>
@ -72,19 +72,19 @@
and (o.deptCode = #{user.locDeptCode} or o.toDeptCode = #{user.locDeptCode})
</where>
order by oi.deviceCode
</when>
<otherwise>
select oi.orderId, oi.deviceCode, oi.productId, info.udi, info.nameCode, info.productName, info.ggxh,
info.batchNo, info.serialNo, info.productionDate, info.expireDate, info.manufactory, info.measname,
info.zczbhhzbapzbh, info.supId, info.supName from device_change_order_item oi
inner join device_change_order o on o.orderId = oi.orderId
left join device_info info on info.deviceCode = oi.deviceCode
<where>
oi.orderId = #{param.orderId} and o.type = #{param.type}
and (o.deptCode = #{user.locDeptCode} or o.toDeptCode = #{user.locDeptCode})
</where>
order by oi.deviceCode
</otherwise>
</choose>
<!-- </when>-->
<!-- <otherwise>-->
<!-- select oi.orderId, oi.deviceCode, oi.productId, info.udi, info.nameCode, info.productName, info.ggxh,-->
<!-- info.batchNo, info.serialNo, info.productionDate, info.expireDate, info.manufactory, info.measname,-->
<!-- info.zczbhhzbapzbh, info.supId, info.supName from device_change_order_item oi-->
<!-- inner join device_change_order o on o.orderId = oi.orderId-->
<!-- left join device_info info on info.deviceCode = oi.deviceCode-->
<!-- <where>-->
<!-- oi.orderId = #{param.orderId} and o.type = #{param.type}-->
<!-- and (o.deptCode = #{user.locDeptCode} or o.toDeptCode = #{user.locDeptCode})-->
<!-- </where>-->
<!-- order by oi.deviceCode-->
<!-- </otherwise>-->
<!-- </choose>-->
</select>
</mapper>

9
src/main/resources/mybatis/mapper/dev/DeviceInfoMapper.xml
Unescape Escape View File

@ -74,6 +74,15 @@
<if test="param.checkLock!=null">
and info.checkLock = #{param.checkLock}
</if>
<if test="param.manufactory!=null">
and info.manufactory like concat('%',#{param.manufactory},'%')
</if>
<if test="param.zczbhhzbapzbh!=null">
and info.zczbhhzbapzbh like concat('%',#{param.zczbhhzbapzbh},'%')
</if>
<if test="param.nameCode!=null">
and info.nameCode like concat('%',#{param.nameCode},'%')
</if>
<if test="param.productName!=null and param.productName!=''">
and info.productName like concat('%',#{param.productName},'%')
</if>

Write Preview
Loading…
Cancel
Save