更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseInOutInfo.java

@@ -322,6 +322,8 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
 
     @TableField(exist = false)
     private String phone;
+    @TableField(exist = false)
+    private String allowEdit;
 
     @TableField(exist = false)
     private ContractManagementInfo contractManagementInfo;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -1038,7 +1038,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 list.add(commonRoleService.selectById(commonStaffRole.getRoleId()));
             }
             for(CommonRole commonRole : list){
-                if(commonRole.getRoleName().equals("决策人") || commonRole.getRoleName().equals("财务")|| commonRole.getRoleName().equals("出纳")|| commonRole.getRoleName().equals("系统管理员")|| commonRole.getRoleName().contains("总")){
+                if(commonRole.getRoleName().equals("内勤") || commonRole.getRoleName().equals("决策人") || commonRole.getRoleName().equals("财务")|| commonRole.getRoleName().equals("出纳")|| commonRole.getRoleName().equals("系统管理员")|| commonRole.getRoleName().contains("总")){
                     List<WarehouseBaseInfo> warehouseBaseInfoList1 = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
                             .eq("comp_id", compId)
                             .eq("warehouse_type","1")

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -116,6 +116,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 .eq("position_id", warehouseInOutInfo.getPositionId())
                 .eq("status_flag", StatusEnum.TEMPORARILY_STORED.getFlag())
                 .orderBy("update_date", false);
+        WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(warehouseInOutInfo.getBaseId());
         Page<WarehouseInOutInfo> warehouseInOutInfoPage = this.selectPage(warehouseInOutInfo.getQueryPage(), warehouseInOutInfoWrapper);
         List<WarehouseInOutInfo> warehouseInOutInfoList = warehouseInOutInfoPage.getRecords();
         if (warehouseInOutInfoList != null) {
@@ -126,6 +127,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 warehouseInOutDetailWrapper.eq("delete_flag", "0");
                 WarehouseInOutDetail warehouseInOutDetail = warehouseInOutDetailService.selectOne(warehouseInOutDetailWrapper);
                 warehouseInOutInfo1.setWarehouseInOutDetail(warehouseInOutDetail);
+                warehouseInOutInfo1.setAllowEdit(warehouseBaseInfo.getAllowEdit());
             }
         }
         warehouseInOutInfoPage.setRecords(warehouseInOutInfoList);