Commit c6ceb45493af7782919ddc0364eb83508df6403a

Authored by 房远帅
1 parent 24904146

楚江ERP:订货单根据部门判断展示价格

@@ -12,9 +12,13 @@ import com.lframework.starter.web.core.components.resp.PageResult; @@ -12,9 +12,13 @@ import com.lframework.starter.web.core.components.resp.PageResult;
12 import com.lframework.starter.web.core.components.security.SecurityUtil; 12 import com.lframework.starter.web.core.components.security.SecurityUtil;
13 import com.lframework.starter.web.core.controller.DefaultBaseController; 13 import com.lframework.starter.web.core.controller.DefaultBaseController;
14 import com.lframework.starter.web.core.utils.PageResultUtil; 14 import com.lframework.starter.web.core.utils.PageResultUtil;
  15 +import com.lframework.starter.web.inner.entity.SysDept;
15 import com.lframework.starter.web.inner.entity.SysRole; 16 import com.lframework.starter.web.inner.entity.SysRole;
16 import com.lframework.starter.web.inner.entity.SysUser; 17 import com.lframework.starter.web.inner.entity.SysUser;
  18 +import com.lframework.starter.web.inner.entity.SysUserDept;
  19 +import com.lframework.starter.web.inner.service.system.SysDeptService;
17 import com.lframework.starter.web.inner.service.system.SysRoleService; 20 import com.lframework.starter.web.inner.service.system.SysRoleService;
  21 +import com.lframework.starter.web.inner.service.system.SysUserDeptService;
18 import com.lframework.starter.web.inner.service.system.SysUserService; 22 import com.lframework.starter.web.inner.service.system.SysUserService;
19 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo; 23 import com.lframework.xingyun.sc.bo.order.GetPurchaseOrderInfoBo;
20 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo; 24 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
@@ -78,7 +82,10 @@ public class PurchaseOrderInfoController extends DefaultBaseController { @@ -78,7 +82,10 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
78 @Autowired 82 @Autowired
79 private SysUserService sysUserService; 83 private SysUserService sysUserService;
80 @Resource 84 @Resource
81 - private SysRoleService sysRoleService; 85 + private SysUserDeptService sysUserDeptService;
  86 + @Resource
  87 + private SysDeptService sysDeptService;
  88 +
82 89
83 /** 90 /**
84 * 查询列表 91 * 查询列表
@@ -139,18 +146,15 @@ public class PurchaseOrderInfoController extends DefaultBaseController { @@ -139,18 +146,15 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
139 vo.setPurchaseOrderId(id); 146 vo.setPurchaseOrderId(id);
140 List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.query(vo); 147 List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.query(vo);
141 if (CollectionUtil.isNotEmpty(purchaseOrderLineList)) { 148 if (CollectionUtil.isNotEmpty(purchaseOrderLineList)) {
142 - //生产人员不展示价格,生产人员角色只会有单个  
143 - List<SysRole> sysRoleList = sysRoleService.getByUserId(SecurityUtil.getCurrentUser().getId());  
144 - if (CollectionUtils.isNotEmpty(sysRoleList)) {  
145 - Boolean b = false;  
146 - for (SysRole sysRole : sysRoleList) {  
147 - //todo 生产人员角色未确定  
148 - if ("scry".equals(sysRole.getCode())) {  
149 - b = true;  
150 - break;  
151 - }  
152 - }  
153 - if (b) { 149 + //生产人员不展示价格,根据部门判断(生产管理科、精轧一车间、精轧车间、品质管理科),需要生产的控制价格
  150 + List<SysUserDept> userDeptList = sysUserDeptService.getByUserId(SecurityUtil.getCurrentUser().getId());
  151 + if (CollectionUtils.isNotEmpty(userDeptList)) {
  152 + SysUserDept sysUserDept = userDeptList.get(0);
  153 + String deptId = sysUserDept.getDeptId();
  154 + SysDept sysDept = sysDeptService.findById(deptId);
  155 + String name = sysDept.getName();
  156 + if (("生产管理科".equals(name) || "精轧一车间".equals(name) || "精轧车间".equals(name)
  157 + || "品质管理科".equals(name)) && "PRODUCTION".equals(result.getType())) {
154 for (PurchaseOrderLine purchaseOrderLine : purchaseOrderLineList) { 158 for (PurchaseOrderLine purchaseOrderLine : purchaseOrderLineList) {
155 purchaseOrderLine.setSalesPrice(null); 159 purchaseOrderLine.setSalesPrice(null);
156 } 160 }