upright
/
backend-duoji-monitor
mirror of https://gitlab.hzleaper.com:81/duoji/backend-duoji-monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
焦作-mxbc-北起
LAPTOP-S9HJSOEB\昊天 2 years ago
parent 20cb77a694
commit 1eb9493fea
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File

5
web/src/main/java/com/zhehekeji/web/service/StockService.java
Unescape Escape View File

@ -412,15 +412,14 @@ public class StockService {
public Stock stockInfo(StockCheck stockCheck) { public Stock stockInfo(StockCheck stockCheck) {
Street street = streetMapper.selectOne(new QueryWrapper<Street>() Street street = streetMapper.selectOne(new QueryWrapper<Street>()
.eq(stockCheck.getStreetPlc()!=null,"plc_Id", stockCheck.getStreetPlc()) .eq(stockCheck.getStreetPlc()!=null&& !"".equals(stockCheck.getStreetPlc()),"plc_Id", stockCheck.getStreetPlc())
.eq(stockCheck.getStreetId()!=null,"id", stockCheck.getStreetId())); .eq(stockCheck.getStreetId()!=null,"id", stockCheck.getStreetId()));
Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("`row`", stockCheck.getRow()) Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("`row`", stockCheck.getRow())
.eq("`column`", stockCheck.getColumn()) .eq("`column`", stockCheck.getColumn())
.eq("`direction`", stockCheck.getDirection()) .eq("`direction`", stockCheck.getDirection())
.eq("`side`", stockCheck.getSide()) .eq("`side`", stockCheck.getSide())
.eq(stockCheck.getStreetId()!=null,"`street_id`", stockCheck.getStreetId()) .eq(street.getId()!=null,"`street_id`", stockCheck.getStreetId()));
.eq(stockCheck.getStreetPlc()!=null,"`street_id`", stockCheck.getStreetPlc()));
if (stock == null) { if (stock == null) {
stock = new Stock(); stock = new Stock();
stock.setColumn(stockCheck.getColumn()); stock.setColumn(stockCheck.getColumn());

Write Preview
Loading…
Cancel
Save