Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server

src/main/java/com/syjiaer/clinic/server/entity/inventory/Inventory.java

@@ -4,22 +4,21 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
 /**
  * <p>
  * 库存主表
  * </p>
  *
  * @author NiuZiYuan
- * @since 2025-04-17
+ * @since 2025-05-12
  */
 @Getter
 @Setter
@@ -75,4 +74,10 @@ public class Inventory implements Serializable {
 
     @ApiModelProperty("最小包装单位")
     private String minPackagingUnit;
+
+    @ApiModelProperty("追溯码")
+    private String traceabilityCode;
+
+    @ApiModelProperty("标识码 由追溯码生成")
+    private String idCodes;
 }

src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java

@@ -412,6 +412,8 @@ public class GoodsService {
         }
         updateGoods.setInventoryWholeNumber(totalWholeNumber);
         updateGoods.setInventoryFragmentNumber(totalFragmentNumber);
+        //更新标识码
+        updateGoods.setIdCode(inventories.get(0).getIdCodes());
         goodsMapper.updateById(updateGoods);
     }