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