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

fix

Browse Source
This commit is contained in:
psh
2024-05-06 13:48:17 +08:00
parent fed9821279
commit 6294624a92
6 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/dao/dto/CzDto.java
View File

@@ -19,5 +19,6 @@ public class CzDto {
private String mother_type;
private String sub_type;
private String error;
private String fbc;
}

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/board/service/impl/BoardServiceImpl.java
View File

@@ -3,12 +3,15 @@ package org.nl.wms.board.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.utils.RedisUtils;
import org.nl.wms.board.service.BoardService;
import org.nl.wms.board.service.dao.dto.*;
import org.nl.wms.board.service.dao.mapper.BoardMapper;
import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,6 +24,8 @@ public class BoardServiceImpl implements BoardService {
private BoardMapper boardMapper;
@Autowired
private RedisUtils redisUtils;
@Autowired
private ISchBasePointService pointService;
public JSONObject cz() {
CzDto czDto = boardMapper.cz(String.valueOf(redisUtils.get("sub_tray")));
@@ -34,6 +39,9 @@ public class BoardServiceImpl implements BoardService {
czDto.setMother_type(String.valueOf(redisUtils.get("mother_type")));
czDto.setSub_type(String.valueOf(redisUtils.get("sub_type")));
czDto.setError(String.valueOf(redisUtils.get("error")));
SchBasePoint schBasePoint= pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
.eq(SchBasePoint::getPoint_code, "FBC01"));
czDto.setFbc(schBasePoint!=null&&schBasePoint.getVehicle_qty()==0?"无货":"有货");
return JSONObject.parseObject(JSON.toJSONString(czDto, SerializerFeature.WriteNullStringAsEmpty));
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
View File

@@ -20,6 +20,9 @@
<if test="query.productDescription != null">
and m.productDescription like CONCAT('%', #{query.productDescription}, '%')
</if>
<if test="query.point_code != null">
and p.point_code like CONCAT('%', #{query.point_code}, '%')
</if>
ORDER BY point_code ASC
</select>

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java
View File

@@ -20,4 +20,6 @@ public class ReportQuery implements Serializable {
private String supplierName;
//绑定状态
private String group_bind_material_status;
//点位编码
private String point_code;
}