diff --git a/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java b/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java index ba1063b..c8d8728 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java +++ b/src/main/java/com/syjiaer/clinic/server/common/util/DictoryUtil.java @@ -70,9 +70,6 @@ public class DictoryUtil { } catch (IOException e) { e.printStackTrace(); } - if (content.isEmpty()){ - return new JSONArray(); - } JSONArray list = JSON.parseArray(content.toString()); return list; } diff --git a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java index 74bbddb..985ea19 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java @@ -69,6 +69,7 @@ public class ItemController extends BaseController { public Result createItem() { Item item = parmsUtil.getObject("data", Item.class); itemService.save(item); + return success(); } /* diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java index 3f9b477..6b830fb 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java @@ -29,6 +29,7 @@ import com.syjiaer.clinic.server.mapper.inventory.InventoryMapper; import com.syjiaer.clinic.server.mapper.social.SocialDirectoryMapper; import com.syjiaer.clinic.server.mapper.social.SocialDirectoryUpinfoMapper; import com.syjiaer.clinic.server.service.BaseService; +import com.syjiaer.clinic.server.service.item.ItemService; import com.syjiaer.clinic.server.service.social.SocialDirectoryService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +45,8 @@ import java.util.Objects; @Service public class GoodsService extends BaseService { + @Autowired + private ItemService itemService; @Autowired private GoodsMapper goodsMapper; @Autowired @@ -132,6 +135,12 @@ public class GoodsService extends BaseService { } } + + //上传对照消息 3301 + if (goods.getHilistCode() != null){ + + itemService.call3301(goods.getHilistCode(),"goods","create"); + } return goods; } diff --git a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java index 496aa6a..b2d354f 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/item/ItemService.java @@ -133,6 +133,12 @@ public class ItemService extends BaseService { item.setPinyinFull(pinyin_full); item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getName()).toUpperCase()); itemMapper.insertOrUpdate(item); + + //上传对照消息 3301 + if (item.getSocialCode() != null){ + this.call3301(item.getSocialCode(),"item","create"); + } + } @@ -207,6 +213,12 @@ public class ItemService extends BaseService { item.setPinyinFull(pinyin_full); item.setPinyinFirst(PinYinUtil.getPinyinFirstLetters(item.getName()).toUpperCase()); itemMapper.updateById(item); + + + //上传对照消息 3301 + if (item.getSocialCode() != null){ + this.call3301(item.getSocialCode(),"item","create"); + } } @@ -325,8 +337,15 @@ public class ItemService extends BaseService { itemGroup.setItemId(itemInfo.getId()); itemGroup.setDelFlag(false); itemGroupListMapper.insertOrUpdate(itemGroup); + + //上传对照消息 3301 + if (itemGroup.getSocialCode() != null){ + this.call3301(itemGroup.getSocialCode(),"item_group_list","create"); + } + } + itemInfo.setUpdateDatetime(LocalDateTime.now()); itemInfo.setUnitPrice(unitPrice); itemInfo.setPurchaseUnitPrice(purchaseUnitPrice);