diff --git a/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java index 2cd2c364..fbc5b8b9 100644 --- a/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java +++ b/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java @@ -2353,15 +2353,12 @@ public class WmImNoticeHController extends BaseController { for (WmImNoticeIEntity wmImNoticeIEntity : wmImNoticeIList) { if(!StringUtil.isEmpty(wmImNoticeIEntity.getGoodsCode())){ try { - - String goodsId = wmImNoticeIEntity.getGoodsCode().split("-")[0]; if(goodsId.endsWith("l")){ goodsId = goodsId.substring(0,goodsId.lastIndexOf("l")); } MvGoodsEntity mvgoods = systemService.findUniqueByProperty(MvGoodsEntity.class,"goodsId",goodsId); // String date[]=wmImNoticeIEntity.getGoodsCode().split("-"); - long hiti = 0; try { if(StringUtil.isEmpty(wmImNoticeIEntity.getBinPlan())){ @@ -2370,7 +2367,6 @@ public class WmImNoticeHController extends BaseController { } } catch (Exception e) { } - wmImNoticeIEntity.setGoodsCode(mvgoods.getGoodsCode()); wmImNoticeIEntity.setGoodsName(mvgoods.getShpMingCheng()); } catch (Exception e) { diff --git a/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java index b433d632..336ee75e 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java @@ -9,6 +9,7 @@ import com.zzjee.wm.entity.WmImNoticeHEntity; import com.zzjee.wm.entity.WmImNoticeIEntity; import com.zzjee.wm.entity.WmInQmIEntity; +import org.jeecgframework.web.system.sms.util.Constants; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -120,22 +121,9 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot }else{ wmImNoticeI.setBinPre("N"); wmImNoticeI.setGoodsQmCount("0"); - TSUser user = ResourceUtil.getSessionUserName(); - String roles = ""; - if (user != null) { - List rUsers = this.findByProperty(TSRoleUser.class, "TSUser.id", user.getId()); - for (TSRoleUser ru : rUsers) { - TSRole role = ru.getTSRole(); - roles += role.getRoleCode() + ","; - } - if (roles.length() > 0) { - roles = roles.substring(0, roles.length() - 1); - } - if(roles.equals("CUS")){ - wmImNoticeI.setBinPre("I"); - } - } - + if(wmImNoticeH.getImSta().equals(Constants.wm_sta0)){ + wmImNoticeI.setBinPre("I"); + } wmImNoticeI.setImNoticeId(wmImNoticeH.getNoticeId()); wmImNoticeI.setImBeizhu(wmImNoticeH.getImBeizhu()); wmImNoticeI.setImCusCode(wmImNoticeH.getImCusCode());