Showing
2 changed files
with
14 additions
and
0 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/PurchaseOrderInfoController.java
| @@ -192,6 +192,18 @@ public class PurchaseOrderInfoController extends DefaultBaseController { | @@ -192,6 +192,18 @@ public class PurchaseOrderInfoController extends DefaultBaseController { | ||
| 192 | result.setShowProductionProcess(b); | 192 | result.setShowProductionProcess(b); |
| 193 | } | 193 | } |
| 194 | result.setContractCreateBy(isCreateBy); | 194 | result.setContractCreateBy(isCreateBy); |
| 195 | + //上传质保书 | ||
| 196 | + List<SysRole> roles = sysRoleService.getByUserId(currentUserId); | ||
| 197 | + List<String> roleCodes = roles.stream().map(SysRole::getCode).collect(Collectors.toList()); | ||
| 198 | + if (CollectionUtils.isNotEmpty(roleCodes)) { | ||
| 199 | + String workshopCode = data.getWorkshopCode(); | ||
| 200 | + // 只有当车间代码在白名单内,且用户拥有对应权限时,才显示上传 | ||
| 201 | + if (Arrays.asList("yfc", "efc", "sfc", "ztfc").contains(workshopCode)) { | ||
| 202 | + if (roleCodes.contains(workshopCode + "pzglkzjy")) { | ||
| 203 | + result.setShowUpload(true); | ||
| 204 | + } | ||
| 205 | + } | ||
| 206 | + } | ||
| 195 | QueryPurchaseOrderLineVo vo = new QueryPurchaseOrderLineVo(); | 207 | QueryPurchaseOrderLineVo vo = new QueryPurchaseOrderLineVo(); |
| 196 | vo.setPurchaseOrderId(id); | 208 | vo.setPurchaseOrderId(id); |
| 197 | List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.query(vo); | 209 | List<PurchaseOrderLine> purchaseOrderLineList = purchaseOrderLineService.query(vo); |
| @@ -39,6 +39,7 @@ | @@ -39,6 +39,7 @@ | ||
| 39 | <result column="stock_up_company_name" property="stockUpCompanyName"/> | 39 | <result column="stock_up_company_name" property="stockUpCompanyName"/> |
| 40 | <result column="workshop_id" property="workshopId"/> | 40 | <result column="workshop_id" property="workshopId"/> |
| 41 | <result column="workshop_name" property="workshopName"/> | 41 | <result column="workshop_name" property="workshopName"/> |
| 42 | + <result column="workshop_code" property="workshopCode"/> | ||
| 42 | <result column="customer_credit_id" property="customerCreditId"/> | 43 | <result column="customer_credit_id" property="customerCreditId"/> |
| 43 | <result column="customer_tier" property="customerTier"/> | 44 | <result column="customer_tier" property="customerTier"/> |
| 44 | <result column="enterprise_type" property="enterpriseType"/> | 45 | <result column="enterprise_type" property="enterpriseType"/> |
| @@ -96,6 +97,7 @@ | @@ -96,6 +97,7 @@ | ||
| 96 | cu1.name AS stock_up_company_name, | 97 | cu1.name AS stock_up_company_name, |
| 97 | tb.workshop_id, | 98 | tb.workshop_id, |
| 98 | ws.name AS workshop_name, | 99 | ws.name AS workshop_name, |
| 100 | + ws.code AS workshop_code, | ||
| 99 | tb.customer_credit_id, | 101 | tb.customer_credit_id, |
| 100 | cc.company_suggested_category AS customer_tier, | 102 | cc.company_suggested_category AS customer_tier, |
| 101 | cc.enterprise_type, | 103 | cc.enterprise_type, |