zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

客户进货需要审核

master
erzhongxmu 2022-03-18 17:35:35 +08:00
parent 0eb985522f
commit df4bc30a15
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
View File

@ -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) {

20
src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java
View File

@ -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<TSRoleUser> 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());