问题处理

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalServiceImpl.java

@@ -157,6 +157,7 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
     @Override
     public void addByWdly(Arrival arrival) {
         arrival.setCode(CodeEnum.ARRIVAL.getCode());
+        arrival.setStatus(1);//设置到货
         this.save(arrival);
 
         //修改采购状态

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/dto/SupplierInfoSelectDto.java

@@ -17,7 +17,7 @@ public class SupplierInfoSelectDto extends BaseSelectDto {
     /**
      * 供应商类型 1贸易商 2工厂
      */
-    private Integer type;
+    private String type;
 
     /**
      * 维多利亚有无账期过滤

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -385,7 +385,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         if (defectiveQuantity.compareTo(BigDecimal.ZERO) == 0) {
             throw new ServiceException("库存不足，无法转换");
         }
-        json.put("quantity", quantity.add(stock.getQuantity()));
+        stock1.setQuantity(quantity.add(stock.getQuantity()));
         json.put("defectiveQuantity", defectiveQuantity.subtract(stock.getQuantity()));
         stock1.setVictoriatouristJson(json.toJSONString());
         updateById(stock1);
@@ -424,8 +424,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         if (quantity.compareTo(BigDecimal.ZERO) == 0) {
             throw new ServiceException("库存不足，无法转换");
         }
-
-        json.put("quantity", quantity.subtract(stock.getQuantity()));
+        stock1.setQuantity(quantity.subtract(stock.getQuantity()));
         json.put("defectiveQuantity", defectiveQuantity.add(stock.getQuantity()));
         stock1.setVictoriatouristJson(json.toJSONString());
         updateById(stock1);