diff --git a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java index 869bbd8..400fb88 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java @@ -70,6 +70,12 @@ public class SocialDirectoryView implements Serializable { private JSONObject json; + private String minPackagingUnit; + private String packagingUnit; + private Integer inventoryWholeNumber; + private Integer inventoryFragmentNumber; + + } diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java index ecd70c9..aa0b1f7 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java @@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.*; import com.syjiaer.clinic.server.common.vo.Page; +import com.syjiaer.clinic.server.entity.goods.Goods; import com.syjiaer.clinic.server.entity.social.*; import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView; +import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; import com.syjiaer.clinic.server.mapper.social.*; import com.syjiaer.clinic.server.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +46,10 @@ public class SocialDirectoryService extends BaseService { private SocialDirectorySelfMapper socialDirectorySelfMapper; @Autowired private SocialDirectoryVersionService socialDirectoryVersionService; + + @Autowired + private GoodsMapper goodsMapper; + private Logger logger = Logger.getLogger(SocialDirectoryService.class.getName()); /* @@ -352,6 +358,16 @@ public class SocialDirectoryService extends BaseService { socialDirectoryView.setSelfpayProp(socialDirectorySelf.getSelfpayProp()); } socialDirectoryView.setJson(JSONObject.parse(socialDirectoryView.getData())); + + QueryWrapper goodsQueryWrapper = new QueryWrapper<>(); + goodsQueryWrapper.eq("hilist_code", code); + goodsQueryWrapper.last("limit 1"); + Goods goods = goodsMapper.selectOne(goodsQueryWrapper); + socialDirectoryView.setMinPackagingUnit(goods.getMinPackagingUnit()); + socialDirectoryView.setPackagingUnit(goods.getPackagingUnit()); + socialDirectoryView.setInventoryWholeNumber(goods.getInventoryWholeNumber()); + socialDirectoryView.setInventoryFragmentNumber(goods.getInventoryFragmentNumber()); + return socialDirectoryView; }