huanglizhi 1 år sedan
förälder
incheckning
6e22f2a656

+ 1 - 1
module-erp/src/main/java/com/hys/app/model/erp/dos/OrderItemDO.java

@@ -124,7 +124,7 @@ public class OrderItemDO implements Serializable {
     private Date endTime;
 
     @ApiModelProperty(name = "has_return", value = "租赁订单详情是否返回")
-    private Boolean hasReturn = false;
+    private Boolean hasReturn;
 
     private Integer stockNum;
 

+ 1 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/OrderManagerImpl.java

@@ -343,7 +343,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
             stockDO.setLockedStock(stockDO.getLockedStock() + dto.getNum());
             stockDO.setUsableStock(stockDO.getActualStock() - stockDO.getLockedStock());
             if (OrderTypeEnum.TO_C.equals(aDo.getOrderType())) {
-                stockDO.setTransitStock(-dto.getNum());
+                stockDO.setTransitStock(stockDO.getTransitStock()+dto.getNum());
             }
         }
         if (OrderTypeEnum.TO_C.equals(aDo.getOrderType())) {

+ 1 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseEntryManagerImpl.java

@@ -249,7 +249,7 @@ public class WarehouseEntryManagerImpl extends BaseServiceImpl<WarehouseEntryMap
             for (OrderItemDO itemDO : list) {
                 WarehouseEntryProductDTO warehouseEntryProductDTO = warehouseEntryDTO.getProductList().stream().filter(item -> item.getProductStockId().equals(itemDO.getProductStockId())).findFirst().get();
                 itemDO.setStockNum(itemDO.getStockNum()-warehouseEntryProductDTO.getNum());
-                if (itemDO.getStockNum() == 0){
+                if (itemDO.getStockNum() <= 0){
                     itemDO.setHasReturn(true);
                 }
                 Optional<WarehouseEntryProductDO> first = doList.stream().filter(item -> item.getScanOrderItemId().equals(itemDO.getId())).findFirst();