台湾盤點修復bug

web/src/main/java/com/zhehekeji/web/service/StockService.java

@@ -307,11 +307,11 @@ public class StockService {
         Stock stock = stockInfo(stockCheck);
         Assert.isTrue(stock != null && stock.getId() != null, "該貨位暫時沒有記錄");
         Integer oldStatus = stock.getStatus();
-        if(StockStatus.SUCCESS.getStatus().equals(oldStatus)){
-            return stock;
-        }
+        Assert.isTrue(StockStatus.ERROR.getStatus().equals(oldStatus), "無需核對");
+
         log.info("check stock correct, shelveID:{},row:{},column:{}", stockCheck.getShelveId(), stockCheck.getRow(), stockCheck.getColumn());
-        stock.setStatus(StockStatus.SUCCESS.getStatus());
+
+        stock.setStatus(StockStatus.MANUAL.getStatus());
         stockMapper.updateById(stock);
         checkLog(stock);
         return stock;
@@ -322,6 +322,10 @@ public class StockService {
 
     private void checkLog(Stock stock){
         CheckLog checkLog = new CheckLog();
+
+        checkLog.setRow(stock.getRow());
+        checkLog.setColumn(stock.getColumn());
+
         checkLog.setCheckNum(stock.getCheckNum());
         checkLog.setPic(stock.getCheckPic());
         checkLog.setShelveId(stock.getShelveId());

web/src/main/resources/mapper/StreetMapper.xml

@@ -13,7 +13,7 @@
         left join camera c2 on t.camera2_id = c2.id
         left join sensor_gun s1 on s1.street_id = t.id and s1.direction = 1
         left join sensor_gun s2 on s2.street_id = t.id and s2.direction = 2
-        left join rfid rf on rf.street_id = t.id
+        left join RFID rf on rf.street_id = t.id
         order by t.id desc
     </select>