Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@@ -433,7 +433,10 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                         recordDto.setCost(goodsPrice.toString());
                         recordDto.setAmount(goodsPrice.multiply(count).toString());
                         wmsInventoryRecordFeign.save(recordDto);
+                        wmsInventoryFeign.updateInventoryCount(countQuery);
                     } else if (busTypeKey.equals("1")) {
+                        //判断所选库位，是否存在该goodsId记录，如果有增加库存，如果没有新增库存记录。
+
                         //维修退库
                         countQuery.setAddOrReduce(0);
                         WmsInventoryRecordDto recordDto = new WmsInventoryRecordDto();
@@ -460,8 +463,9 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                         recordDto.setCost(goodsPrice.toString());
                         recordDto.setAmount(goodsPrice.multiply(count).toString());
                         wmsInventoryRecordFeign.save(recordDto);
+                        wmsInventoryFeign.updateInventoryCount(countQuery);
                     }
-                    wmsInventoryFeign.updateInventoryCount(countQuery);
+
                 }
 
             }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/RackVo.java

@@ -7,5 +7,6 @@ public class RackVo {
 
     String rackName;
     String rackCode;
+    String sid;
 
 }