diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
index e2231b25..64e0b5ad 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
@@ -61,6 +61,10 @@ public class TbConsInfo implements Serializable {
     @ApiModelProperty(value = "单位换算")
     private BigDecimal conUnitTwoConvert;
 
+    @Column(name = "`default_unit`")
+    @ApiModelProperty(value = "默认入库单位")
+    private String defaultUnit;
+
     @Column(name = "`laster_in_stock`")
     @ApiModelProperty(value = "最近一次入库量")
     private BigDecimal lasterInStock;
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfoV2.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfoV2.java
index 111aeb04..7874d061 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfoV2.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfoV2.java
@@ -63,6 +63,10 @@ public class TbConsInfoV2 implements Serializable {
     @ApiModelProperty(value = "单位换算")
     private BigDecimal conUnitTwoConvert;
 
+    @Column(name = "`default_unit`")
+    @ApiModelProperty(value = "默认入库单位")
+    private String defaultUnit;
+
 
     @Column(name = "`laster_in_stock`")
     @ApiModelProperty(value = "最近一次入库量")
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
index 3b7a1451..ab6a429d 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
@@ -231,10 +231,18 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
             }
             BigDecimal changeStock = conInfos.getStockNumber();
             //副单位的实际修改值
-            if (StringUtils.isNotBlank(conInfos.getUnit()) && conInfos.getUnit().equals(info.getConUnitTwo())) {
+            if(StringUtils.isNotBlank(conInfos.getUnit())){
+                info.setDefaultUnit(conInfos.getUnit());
+                if(conInfos.getUnit().equals(info.getConUnitTwo())){
+                    changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                }
+            }else if(info.getConUnitTwo().equals(info.getDefaultUnit())) {
+                info.setDefaultUnit(info.getConUnitTwo());
                 changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP);
             }
 
+
+
             TbConsSuppFlow suppFlow = new TbConsSuppFlow();
 
             TbConsInfoFlow flow = new TbConsInfoFlow();